From 61e2f6e92223d790cb9991d193e8eaa289ae5026 Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Wed, 15 Oct 2008 12:39:06 +0000
Subject: [PATCH] Use pkg-config instead of enlightenment-config.

SVN revision: 36670
---
 Makefile.am  |  6 +++---
 configure.in | 33 ++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7aa78bb..e3ab7e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = 
+SUBDIRS =
 
 EDJE_FLAGS = -v \
 -id $(top_srcdir) \
@@ -22,7 +22,7 @@ CONFIG_CLEAN_FILES = e_modules-mpdule.spec mpdule.edj
 INCLUDES               = -I. \
 			 -I$(top_srcdir) \
 			 -I$(includedir) \
-			 @e_cflags@ @MPD_CFLAGS@
+			 @E_CFLAGS@ @MPD_CFLAGS@
 
 pkgdir                 = $(datadir)/$(MODULE_ARCH)
 
@@ -30,7 +30,7 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
 		         e_mod_main.h \
 			 e_mod_config.c
-module_la_LIBADD       = @e_libs@ @MPD_LIBS@
+module_la_LIBADD       = @E_LIBS@ @MPD_LIBS@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/mpdule.edj
 
diff --git a/configure.in b/configure.in
index fbab7f7..145fe13 100644
--- a/configure.in
+++ b/configure.in
@@ -32,32 +32,35 @@ AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 
 uname=`uname`
 
-#
-# Check EFL Libs
-#
-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})
 
-#
-# Check Enlightenment
-#
-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=$(pkg-config --variable=modules enlightenment)/${PACKAGE}
 
 #
 # Check MPD
 #
 PKG_CHECK_MODULES(MPD, libmpd)
 
-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_OUTPUT([
 Makefile
 e_modules-mpdule.spec