forked from enlightenment/efl
Eina: link against iconv, use rt_libs to hold -lrt and add -lrt to eina.pc.in's Libs.private
SVN revision: 61358
This commit is contained in:
parent
f9fe039a95
commit
70d3c66bd7
|
@ -612,9 +612,11 @@ AC_MSG_RESULT([${have_shmopen}])
|
||||||
|
|
||||||
if test "x${have_shmopen}" = "xyes"; then
|
if test "x${have_shmopen}" = "xyes"; then
|
||||||
AC_DEFINE(HAVE_SHMOPEN, 1, [Does your system provide shm_open])
|
AC_DEFINE(HAVE_SHMOPEN, 1, [Does your system provide shm_open])
|
||||||
EINA_LIBS="${EINA_LIBS} -lrt"
|
rt_libs="-lrt"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_SUBST([rt_libs])
|
||||||
|
|
||||||
### Modules
|
### Modules
|
||||||
|
|
||||||
if test "x${have_default_mempool}" = "xyes" ; then
|
if test "x${have_default_mempool}" = "xyes" ; then
|
||||||
|
|
|
@ -8,5 +8,5 @@ Description: A Library that implements fast data types and miscellaneous tools
|
||||||
@pkgconfig_requires_private@: @requirement_eina@
|
@pkgconfig_requires_private@: @requirement_eina@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${libdir} -leina
|
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
|
Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina
|
||||||
|
|
|
@ -162,7 +162,7 @@ else
|
||||||
libeina_la_SOURCES = $(base_sources)
|
libeina_la_SOURCES = $(base_sources)
|
||||||
endif
|
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_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
|
||||||
libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
|
libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue