From f4b75390deace0fd6967fc9d1da8e33303900041 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 14 Aug 2008 01:16:27 +0000 Subject: [PATCH] build! fix breaks! SVN revision: 35473 --- configure.in | 20 +++++++++++++++----- src/bin/e_main.c | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 0897ba44e..0de3f4236 100644 --- a/configure.in +++ b/configure.in @@ -209,14 +209,24 @@ PKG_CHECK_MODULES(ECORE_TXT, [ ecore-txt ], [ have_temp="yes" - # This test will succeed as these modules are also checked before + have_bat="yes" +], [ have_temp="no"]) + +AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes") +if test x$have_temp = "xyes"; then PKG_CHECK_MODULES(TEMPERATURE, [ ecore ecore-file ]) -], [ have_temp="no"]) -AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes") +fi AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = "xyes") +if test x$have_bat = "xyes"; then + PKG_CHECK_MODULES(BATTERY, [ + ecore + ecore-file + ecore-con + ]) +fi PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no) PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no) @@ -232,8 +242,8 @@ if test x$have_edbus = "xyes"; then fi fi -e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" " -e_cflags="-DUSE_E_CONFIG_H "$define_e_dbus" "$E_CFLAGS" "$E_DBUS_CFLAGS" " +e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS" " +e_cflags="-DUSE_E_CONFIG_H "$define_e_dbus" "$E_CFLAGS" "$E_DBUS_CFLAGS" "$ECORE_IMF_CFLAGS" " e_configflags="-DUSE_E_CONFIG_H "$define_e_dbus" " AC_SUBST(e_libs) diff --git a/src/bin/e_main.c b/src/bin/e_main.c index df36cfa4d..078894bf5 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -3,7 +3,9 @@ */ #include "e.h" +#ifdef HAVE_ECORE_IMF #include +#endif EAPI int e_precache_end = 0;