E SVN: caro IN trunk/eina: . src/lib

[Enlightenment S. <no-...@en...>]

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

Author:       caro
Date:         2011-07-14 00:18:11 -0700 (Thu, 14 Jul 2011)
New Revision: 61358
Trac:         http://trac.enlightenment.org/e/changeset/61358

Modified:
  trunk/eina/configure.ac trunk/eina/eina.pc.in trunk/eina/src/lib/Makefile.am 

Modified: trunk/eina/configure.ac
===================================================================
--- trunk/eina/configure.ac	2011-07-14 06:58:59 UTC (rev 61357)
+++ trunk/eina/configure.ac	2011-07-14 07:18:11 UTC (rev 61358)
@@ -612,9 +612,11 @@
 
 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

Modified: trunk/eina/eina.pc.in
===================================================================
--- trunk/eina/eina.pc.in	2011-07-14 06:58:59 UTC (rev 61357)
+++ trunk/eina/eina.pc.in	2011-07-14 07:18:11 UTC (rev 61358)
@@ -8,5 +8,5 @@
 @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

Modified: trunk/eina/src/lib/Makefile.am
===================================================================
--- trunk/eina/src/lib/Makefile.am	2011-07-14 06:58:59 UTC (rev 61357)
+++ trunk/eina/src/lib/Makefile.am	2011-07-14 07:18:11 UTC (rev 61358)
@@ -162,7 +162,7 @@
 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@