summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac14
-rw-r--r--enlightenment.pc.in2
-rw-r--r--src/bin/Makefile.am2
3 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index fae22c9..318e2b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,6 +241,7 @@ PKG_CHECK_MODULES(E_IMC, [
241]) 241])
242 242
243PKG_CHECK_MODULES(E_THUMB, [ 243PKG_CHECK_MODULES(E_THUMB, [
244 eina-0
244 evas 245 evas
245 ecore 246 ecore
246 ecore-evas 247 ecore-evas
@@ -255,8 +256,9 @@ PKG_CHECK_MODULES(E_FM, [
255 ecore 256 ecore
256 ecore-file 257 ecore-file
257 ecore-ipc 258 ecore-ipc
258 eet >= 1.0.1 259 eet >= 1.2.3
259 efreet 260 efreet
261 dbus-1
260 edbus 262 edbus
261 ehal 263 ehal
262 eina-0 264 eina-0
@@ -284,6 +286,7 @@ PKG_CHECK_MODULES(E_INIT, [
284 ecore 286 ecore
285 ecore-file 287 ecore-file
286 ecore-evas 288 ecore-evas
289 ecore-x
287 edje 290 edje
288 ecore-ipc 291 ecore-ipc
289 eet >= 1.0.1 292 eet >= 1.0.1
@@ -300,15 +303,16 @@ PKG_CHECK_MODULES(E, [
300 ecore-ipc 303 ecore-ipc
301 ecore-job 304 ecore-job
302 ecore-file 305 ecore-file
303 eet >= 1.0.1 306 eet >= 1.2.3
304 edje 307 edje
305 efreet 308 efreet
306 efreet-mime 309 efreet-mime
307 eina-0 310 eina-0
311 dbus-1
308 edbus 312 edbus
309 ehal 313 ehal
310]) 314])
311requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime eina-0 edbus ehal" 315requirements_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"
312 316
313AC_E_CHECK_PKG(ECORE_IMF, [ecore-imf ecore-imf-evas], [], [:]) 317AC_E_CHECK_PKG(ECORE_IMF, [ecore-imf ecore-imf-evas], [], [:])
314 318
@@ -359,7 +363,7 @@ AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as c
359AM_CONDITIONAL(HAVE_BATTERY, false) 363AM_CONDITIONAL(HAVE_BATTERY, false)
360define([CHECK_MODULE_BATTERY], 364define([CHECK_MODULE_BATTERY],
361[ 365[
362 AC_E_CHECK_PKG(BATTERY, [ecore ecore-file ecore-con], 366 AC_E_CHECK_PKG(BATTERY, [ecore ecore-file ecore-con eina-0],
363 [], [BATTERY=false]) 367 [], [BATTERY=false])
364]) 368])
365 369
@@ -376,7 +380,7 @@ AM_CONDITIONAL(HAVE_TEMPERATURE, false)
376define([CHECK_MODULE_TEMPERATURE], 380define([CHECK_MODULE_TEMPERATURE],
377[ 381[
378 AC_E_CHECK_PKG(ECORE_TXT, [ecore-txt], [], [TEMPERATURE=false]) 382 AC_E_CHECK_PKG(ECORE_TXT, [ecore-txt], [], [TEMPERATURE=false])
379 AC_E_CHECK_PKG(TEMPERATURE, [ecore ecore-file], [], [TEMPERATURE=false]) 383 AC_E_CHECK_PKG(TEMPERATURE, [ecore ecore-file eina-0], [], [TEMPERATURE=false])
380]) 384])
381 385
382AM_CONDITIONAL(HAVE_EXCHANGE, false) 386AM_CONDITIONAL(HAVE_EXCHANGE, false)
diff --git a/enlightenment.pc.in b/enlightenment.pc.in
index dc7b398..0694636 100644
--- a/enlightenment.pc.in
+++ b/enlightenment.pc.in
@@ -11,5 +11,5 @@ Description: Enlightenmnt Window Manager
11Requires: @requirements_e@ 11Requires: @requirements_e@
12Version: @VERSION@ 12Version: @VERSION@
13Libs: -L${libdir} 13Libs: -L${libdir}
14Libs.private: 14Libs.private: -lm
15Cflags: -I${includedir} @e_configflags@ 15Cflags: -I${includedir} @e_configflags@
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index f59ec9e..2f49325 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -313,7 +313,7 @@ e_main.c \
313$(enlightenment_src) 313$(enlightenment_src)
314 314
315enlightenment_LDFLAGS = -export-dynamic 315enlightenment_LDFLAGS = -export-dynamic
316enlightenment_LDADD = @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ 316enlightenment_LDADD = @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ -lm
317 317
318enlightenment_imc_SOURCES = \ 318enlightenment_imc_SOURCES = \
319e.h \ 319e.h \