Eina: link against iconv, use rt_libs to hold -lrt and add -lrt to eina.pc.in's Libs...

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@61358 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 26042b9..73f918e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -612,9 +612,11 @@ AC_MSG_RESULT([${have_shmopen}])
 
 if test "x${have_shmopen}" = "xyes"; then
    AC_DEFINE(HAVE_SHMOPEN, 1, [Does your system provide shm_open])
-   EINA_LIBS="${EINA_LIBS} -lrt"
+   rt_libs="-lrt"
 fi
 
+AC_SUBST([rt_libs])
+
 ### Modules
 
 if test "x${have_default_mempool}" = "xyes" ; then

diff --git a/eina.pc.in b/eina.pc.in
index 3995be0..7742114 100644 (file)
--- a/eina.pc.in
+++ b/eina.pc.in
@@ -8,5 +8,5 @@ Description: A Library that implements fast data types and miscellaneous tools
 @pkgconfig_requires_private@: @requirement_eina@
 Version: @VERSION@
 Libs: -L${libdir} -leina
-Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ @iconv_libs@ -ldl
+Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ @rt_libs@ @iconv_libs@ -ldl -lm
 Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0d1717c..7793593 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -162,7 +162,7 @@ else
 libeina_la_SOURCES = $(base_sources)
 endif
 
-libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@
+libeina_la_LIBADD = @iconv_libs@ @rt_libs@ @EINA_LIBS@ @dlopen_libs@
 libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
 libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@