diff --git a/configure.ac b/configure.ac index fae22c93f..318e2b51e 100644 --- a/configure.ac +++ b/configure.ac @@ -241,6 +241,7 @@ PKG_CHECK_MODULES(E_IMC, [ ]) PKG_CHECK_MODULES(E_THUMB, [ + eina-0 evas ecore ecore-evas @@ -255,8 +256,9 @@ PKG_CHECK_MODULES(E_FM, [ ecore ecore-file ecore-ipc - eet >= 1.0.1 + eet >= 1.2.3 efreet + dbus-1 edbus ehal eina-0 @@ -284,6 +286,7 @@ PKG_CHECK_MODULES(E_INIT, [ ecore ecore-file ecore-evas + ecore-x edje ecore-ipc eet >= 1.0.1 @@ -300,15 +303,16 @@ PKG_CHECK_MODULES(E, [ ecore-ipc ecore-job ecore-file - eet >= 1.0.1 + eet >= 1.2.3 edje efreet efreet-mime eina-0 + dbus-1 edbus ehal ]) -requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime eina-0 edbus ehal" +requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime eina-0 dbus-1 edbus ehal" AC_E_CHECK_PKG(ECORE_IMF, [ecore-imf ecore-imf-evas], [], [:]) @@ -359,7 +363,7 @@ AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as c AM_CONDITIONAL(HAVE_BATTERY, false) define([CHECK_MODULE_BATTERY], [ - AC_E_CHECK_PKG(BATTERY, [ecore ecore-file ecore-con], + AC_E_CHECK_PKG(BATTERY, [ecore ecore-file ecore-con eina-0], [], [BATTERY=false]) ]) @@ -376,7 +380,7 @@ AM_CONDITIONAL(HAVE_TEMPERATURE, false) define([CHECK_MODULE_TEMPERATURE], [ AC_E_CHECK_PKG(ECORE_TXT, [ecore-txt], [], [TEMPERATURE=false]) - AC_E_CHECK_PKG(TEMPERATURE, [ecore ecore-file], [], [TEMPERATURE=false]) + AC_E_CHECK_PKG(TEMPERATURE, [ecore ecore-file eina-0], [], [TEMPERATURE=false]) ]) AM_CONDITIONAL(HAVE_EXCHANGE, false) diff --git a/enlightenment.pc.in b/enlightenment.pc.in index dc7b39849..069463681 100644 --- a/enlightenment.pc.in +++ b/enlightenment.pc.in @@ -11,5 +11,5 @@ Description: Enlightenmnt Window Manager Requires: @requirements_e@ Version: @VERSION@ Libs: -L${libdir} -Libs.private: +Libs.private: -lm Cflags: -I${includedir} @e_configflags@ diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index f59ec9eb5..2f49325fe 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -313,7 +313,7 @@ e_main.c \ $(enlightenment_src) enlightenment_LDFLAGS = -export-dynamic -enlightenment_LDADD = @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ +enlightenment_LDADD = @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ -lm enlightenment_imc_SOURCES = \ e.h \