Use pkg-config instead of enlightenment-config.

SVN revision: 36670

configure.ac

@@ -34,20 +34,27 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 AC_PROG_LIBTOOL
 
-AM_GNU_GETTEXT([external]) 
+AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.14)
 
-# Checks for libraries.
-AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
+# 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})
 
-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)
+PKG_CHECK_MODULES(E, [enlightenment])
 
-datadir="${e_modules}/${PACKAGE}"    
+datadir=$(pkg-config --variable=modules enlightenment)/${PACKAGE}
 AC_ARG_ENABLE(homedir-install,
   AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
   [ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]

src/Makefile.am

@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS            = -I. \
 			 -I$(top_srcdir) \
 			 -I$(includedir) \
-			 @e_cflags@
+			 @E_CFLAGS@
 
 pkgdir                 = $(datadir)/$(MODULE_ARCH)
 
@@ -15,7 +15,7 @@ module_la_SOURCES      = e_mod_main.c \
 			 CalcEphem.c \
 			 CalcEphem.h \
 			 Moon.c
-module_la_LIBADD       = @e_libs@
+module_la_LIBADD       = @E_LIBS@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h