Fix for 64-bit compatibility.

- Fix hardcoding path.
- Use %configure to set default paths.

Change-Id: Idbea2d662788c5e677a4ac2dde35957e2e852598

diff --git a/configure.ac b/configure.ac
index 095104da1d647c657cda5fbb676fcaaeca13a48e..caa2aba85ba7390fd519ab27467446f5ab7d9505 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -7,9 +7,12 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_LIBTOOL
+AM_PROG_CC_C_O
 
 # Checks for libraries.
 # FIXME: Replace `main' with a function in `-liniparser':

diff --git a/imgp/Makefile.am b/imgp/Makefile.am
index a7ef877c7c0914e08884a8ac0accb28bb806cc96..a1b69582a1a0c1252fb7afc3c832aa7f111a0a71 100755 (executable)
--- a/imgp/Makefile.am
+++ b/imgp/Makefile.am
@@ -21,7 +21,7 @@ libmmutil_imgp_la_LIBADD = $(MMCOMMON_LIBS) \
                            $(GMODULE_LIBS) \
                            $(MMLOG_LIBS)
 
-libmmutil_imgp_la_CFLAGS += $(MMLOG_CFLAGS) -DMMF_LOG_OWNER=0x0100 -DMMF_DEBUG_PREFIX=\"MMF-IMAGE\"
+libmmutil_imgp_la_CFLAGS += $(MMLOG_CFLAGS) -DMMF_LOG_OWNER=0x0100 -DMMF_DEBUG_PREFIX=\"MMF-IMAGE\" -DLIBPREFIX=\"$(libdir)\"
 
 pcfiles = mmutil-imgp.pc
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/imgp/include/mm_util_imgp_internal.h b/imgp/include/mm_util_imgp_internal.h
index 475ca07002502484ae02713a0b8fbe90cc34f6df..a4b6bd2e672d1bdf34f2dc62530edf7343fd0835 100644 (file)
--- a/imgp/include/mm_util_imgp_internal.h
+++ b/imgp/include/mm_util_imgp_internal.h
@@ -32,8 +32,8 @@
 #include <gmodule.h>
 #include <mm_debug.h>
 
-#define PATH_NEON_LIB                                  "/usr/lib/libmmutil_imgp_neon.so"
-#define PATH_GSTCS_LIB                                 "/usr/lib/libmmutil_imgp_gstcs.so"
+#define PATH_NEON_LIB                                  LIBPREFIX  "/libmmutil_imgp_neon.so"
+#define PATH_GSTCS_LIB                                 LIBPREFIX "/libmmutil_imgp_gstcs.so"
 
 #define IMGP_FUNC_NAME                                 "mm_imgp"
 #define IMAGE_FORMAT_LABEL_BUFFER_SIZE 9

diff --git a/imgp/mmutil-imgp.pc.in b/imgp/mmutil-imgp.pc.in
index c821c87de1c57719b74f83a79706b15e20565c71..0810a2041dc1cc773d00417df0d9556af9a8c752 100755 (executable)
--- a/imgp/mmutil-imgp.pc.in
+++ b/imgp/mmutil-imgp.pc.in
@@ -8,5 +8,5 @@ Description : Multimedia Framework Utility Library
 Requires : @IMGP_REQPKG@
 Version : @VERSION@
 Libs : -L${libdir} -lmmutil_imgp
-Cflags : -I${includedir}/mmf
+Cflags : -I${includedir}/mmf -DLIBPREFIX=\"${libdir}\"
 

diff --git a/jpeg/Makefile.am b/jpeg/Makefile.am
index 58aee43e34f61c98d09a7908fa7a46fd6907027b..35f3fa592f7abbded680c1ffb058a0adc9f2abc7 100644 (file)
--- a/jpeg/Makefile.am
+++ b/jpeg/Makefile.am
@@ -14,7 +14,7 @@ libmmutil_jpeg_la_CFLAGS = -I$(srcdir)/include \
 libmmutil_jpeg_la_LIBADD = $(MMCOMMON_LIBS) -ljpeg -ldl \
                           $(MMTA_LIBS)  
 
-libmmutil_jpeg_la_CFLAGS += $(MMLOG_CFLAGS) -DMMF_LOG_OWNER=0x0100 -DMMF_DEBUG_PREFIX=\"MMF-IMAGE\"
+libmmutil_jpeg_la_CFLAGS += $(MMLOG_CFLAGS) -DMMF_LOG_OWNER=0x0100 -DMMF_DEBUG_PREFIX=\"MMF-IMAGE\" -DLIBPREFIX=\"$(libdir)\"
 
 pcfiles = mmutil-jpeg.pc
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/jpeg/mm_util_jpeg.c b/jpeg/mm_util_jpeg.c
index 9b09220cf9a19e4a74e1ba3836271cc356797162..591c71b42424ebd97dfa46dd1f68baa11ffeb233 100644 (file)
--- a/jpeg/mm_util_jpeg.c
+++ b/jpeg/mm_util_jpeg.c
@@ -57,7 +57,7 @@
 /* H/W JPEG codec */
 #include <dlfcn.h>
 #define ENV_NAME_USE_HW_CODEC           "IMAGE_UTIL_USE_HW_CODEC"
-#define LIB_PATH_HW_CODEC_LIBRARY       "/usr/lib/libmm_jpeg_hw.so"
+#define LIB_PATH_HW_CODEC_LIBRARY       LIBPREFIX "/libmm_jpeg_hw.so"
 #define ENCODE_JPEG_HW_FUNC_NAME        "mm_jpeg_encode_hw"
 typedef int (*EncodeJPEGFunc)(unsigned char *src, int width, int height, mm_util_jpeg_yuv_format in_fmt, int quality,
                               unsigned char **dst, int *dst_size);

diff --git a/jpeg/mmutil-jpeg.pc.in b/jpeg/mmutil-jpeg.pc.in
index 32f27d2a5ed8c6f25c6b586760e442d235ccb3f0..2a01766338ee9855c4199cc17bb3a8c48904e067 100644 (file)
--- a/jpeg/mmutil-jpeg.pc.in
+++ b/jpeg/mmutil-jpeg.pc.in
@@ -8,5 +8,5 @@ Description : Multimedia Framework Utility Library
 Requires : @JPEG_REQPKG@
 Version : @VERSION@
 Libs : -L${libdir} -lmmutil_jpeg
-Cflags : -I${includedir}/mmf
+Cflags : -I${includedir}/mmf -DLIBPREFIX=\"${libdir}\"
 

diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec
index 88d0c0702535d55984433448426c3a8f37bfdb50..c3a1b2dc2a9f8ea196205e4bcd88addcbbda6542 100644 (file)
--- a/packaging/libmm-utility.spec
+++ b/packaging/libmm-utility.spec
@@ -40,8 +40,8 @@ Requires:   %{name} = %{version}-%{release}
 ./autogen.sh
 
 CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" -D_MM_PROJECT_FLOATER" \
-LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--hash-style=both -Wl,--as-needed" \
-./configure --prefix=%{_prefix}
+LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--hash-style=both -Wl,--as-needed" \
+%configure
 make %{?jobs:-j%jobs}
 
 sed -i -e "s#@IMGP_REQPKG@#$IMGP_REQPKG#g" imgp/mmutil-imgp.pc