diff --git a/configure.in b/configure.in index 987fbe779..05f7e8913 100644 --- a/configure.in +++ b/configure.in @@ -177,6 +177,12 @@ PKG_CHECK_MODULES(E, [ efreet ]) +# ecore-txt is really only needed by the temperature module, +# so we check for it separately. +# in a perfect world, we'd also disable the temperate module here +# if ecore-txt isn't available. +PKG_CHECK_MODULES(ECORE_TXT, ecore-txt) + e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" " e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" " AC_SUBST(e_libs) diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am index 78ffb7db3..9a01d90ce 100644 --- a/src/modules/temperature/Makefile.am +++ b/src/modules/temperature/Makefile.am @@ -15,13 +15,13 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ @ECORE_TXT_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_mod_config.c -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECORE_TXT_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h