Correctly use pkg-config and now enlightenment-config is really deprecated !

SVN revision: 36668

Makefile.am

@@ -20,7 +20,7 @@ EXTRA_DIST = $(files_DATA) e_modules-alarm.spec \
 INCLUDES               = -I. \
 			 -I$(top_srcdir) \
 			 -I$(includedir) \
-			 @e_cflags@
+			 @E_CFLAGS@
 pkgdir                 = $(datadir)/$(MODULE_ARCH)
 
 pkg_LTLIBRARIES        = module.la
@@ -28,7 +28,7 @@ module_la_SOURCES      = e_mod_main.c \
 		         e_mod_main.h \
 			 e_mod_config.c \
 			 e_mod_config_alarm.c
-module_la_LIBADD       = @e_libs@
+module_la_LIBADD       = @E_LIBS@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/alarm.edj
 

configure.in

@@ -27,21 +27,30 @@ AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 AC_DEFINE_UNQUOTED(MODULE_VERSION, "$VERSION", "Module version")
 
-AC_PATH_PROG(E_CONFIG, "enlightenment-config", "", $PATH)
-e_cflags=`$E_CONFIG --cflags`
-e_libs=`$E_CONFIG --libs`
-e_modules=`$E_CONFIG --module-dir`
-AC_SUBST(e_cflags)
-AC_SUBST(e_libs)
+# Find edje_cc
+PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
+AC_ARG_WITH(edje-cc,
+  AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
+  [
+    v=$withval;
+    EDJE_CC=$v
+  ],[
+    EDJE_CC=$(pkg-config --variable=prefix edje)/bin/edje_cc
+  ]
+)
+AC_SUBST(EDJE_CC)
+AC_MSG_CHECKING([Which edje_cc to use])
+AC_MSG_RESULT(${EDJE_CC})
+
+PKG_CHECK_MODULES(E, [enlightenment])
+
+datadir=$(pkg-config --variable=module enlightenment)/${PACKAGE}
 
-datadir="${e_modules}/${PACKAGE}"    
 AC_ARG_ENABLE(homedir-install,
   AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
   [ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
 )
 
-AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
-
 AC_OUTPUT([
 Makefile
 po/Makefile.in