Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e
Dir : e17/apps/e Modified Files: configure.in Log Message: - embryo is not a needed pkg - make ecore_imf optional - add pkg-config requirements to enlightenment.pc - remove battery check dependant on ecore-txt - move Ecore_Txt.h from e.h to temperature module =================================================================== RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.211 retrieving revision 1.212 diff -u -3 -r1.211 -r1.212 --- configure.in 6 Aug 2008 05:42:53 -0000 1.211 +++ configure.in 13 Aug 2008 19:22:01 -0000 1.212 @@ -183,35 +183,37 @@ PKG_CHECK_MODULES(E, [ evas ecore + ecore-x ecore-evas - ecore-file - ecore-ipc ecore-con + ecore-ipc ecore-job - ecore-imf - ecore-imf-evas - edje + ecore-file eet >= 1.0.1 - embryo + edje efreet efreet-mime ]) +requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime" + +PKG_CHECK_MODULES(ECORE_IMF, [ + ecore-imf + ecore-imf-evas +], [ + have_ecore_imf="yes" + AC_DEFINE(HAVE_ECORE_IMF, 1, [Ecore IMF support]) +], [ have_ecore_imf="no" ] +) PKG_CHECK_MODULES(ECORE_TXT, [ ecore-txt ], [ have_temp="yes" - have_battery="yes" # This test will succeed as these modules are also checked before PKG_CHECK_MODULES(TEMPERATURE, [ ecore ecore-file ]) - PKG_CHECK_MODULES(BATTERY, [ - ecore - ecore-file - ecore-con - ]) ], [ have_temp="no"]) AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes") AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = "xyes") @@ -224,6 +226,7 @@ define_e_dbus="" if test x$have_edbus = "xyes"; then define_e_dbus="-DHAVE_EDBUS" + requirements_e=$requirements_e" edbus" if test x$have_ehal = "xyes"; then AC_DEFINE(HAVE_EDBUS, 1, [E_Dbus support]) fi @@ -236,6 +239,7 @@ AC_SUBST(e_libs) AC_SUBST(e_cflags) AC_SUBST(e_configflags) +AC_SUBST(requirements_e) profile="SLOW_PC" AC_ARG_WITH(profile, ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs