From 70d3c66bd7fb908c758b6ac31d51febce8801e40 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 14 Jul 2011 07:18:11 +0000 Subject: [PATCH] Eina: link against iconv, use rt_libs to hold -lrt and add -lrt to eina.pc.in's Libs.private SVN revision: 61358 --- legacy/eina/configure.ac | 4 +++- legacy/eina/eina.pc.in | 2 +- legacy/eina/src/lib/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index 26042b9549..73f918ea30 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/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/legacy/eina/eina.pc.in b/legacy/eina/eina.pc.in index 3995be0a9f..7742114ff0 100644 --- a/legacy/eina/eina.pc.in +++ b/legacy/eina/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/legacy/eina/src/lib/Makefile.am b/legacy/eina/src/lib/Makefile.am index 0d1717c191..7793593ee3 100644 --- a/legacy/eina/src/lib/Makefile.am +++ b/legacy/eina/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@