improve configure.in and delete m4 macros

3 files changed, 52 insertions, 42 deletions

diff --git a/configure.in b/configure.in
index 35352cb..c031510 100644
--- a/configure.in
+++ b/configure.in
@@ -21,8 +21,58 @@ AC_C_INLINE
 dnl espik specific check (include in m4)
 AC_C___ATTRIBUTE__
 AC_ESPIK_DEBUG
-AC_CHK_ECORE
-AC_CHK_EVAS
+
+AC_ARG_WITH(evas-config,
+[  --with-evas-config=EVAS_CONFIG    use evas-config specified ],
+[
+  EVAS_CONFIG=$withval;
+  echo "using "$EVAS_CONFIG" for evas-config";
+],[
+  PROG="evas-config";
+  AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
+])
+evas_cflags=`$EVAS_CONFIG --cflags`
+evas_libs=`$EVAS_CONFIG --libs`
+AC_SUBST(evas_cflags)
+AC_SUBST(evas_libs)
+
+AC_ARG_WITH(ecore-config,
+[  --with-ecore-config=ECORE_CONFIG  use ecore-config specified ],
+[
+  ECORE_CONFIG=$withval;
+  echo "using "$ECORE_CONFIG" for ecore-config";
+],[
+  PROG="ecore-config";
+  AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH)
+])
+ecore_cflags=`$ECORE_CONFIG --cflags`
+ecore_libs=`$ECORE_CONFIG --libs`
+AC_SUBST(ecore_cflags)
+AC_SUBST(ecore_libs)
+
+AC_ARG_WITH(edje-config,
+[  --with-edje-config=EDJE_CONFIG    use edje-config specified ],
+[
+  EDJE_CONFIG=$withval;
+  echo "using "$EDJE_CONFIG" for edje-config";
+],[
+  PROG="edje-config";
+  AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH)
+])
+edje_cflags=`$EDJE_CONFIG --cflags`
+edje_libs=`$EDJE_CONFIG --libs`
+
+edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc"
+AC_ARG_WITH(edje-cc,
+[  --with-edje-cc=PATH              specify a specific path to edje_cc],
+[
+  v=$withval;
+  edje_cc=$v
+  echo "  Enlightenment edje_cc explicitly set to "$edje_cc;
+],[
+  edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc"
+])
+AC_SUBST(edje_cc)
 
 AC_OUTPUT([
   Makefile
diff --git a/m4/ac_ecore.m4 b/m4/ac_ecore.m4
deleted file mode 100644
index 952026a..0000000
--- a/m4/ac_ecore.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-AC_DEFUN([AC_CHK_ECORE],
-[
-  AC_ARG_WITH(
-    [ecore-config],
-    [  --with-ecore-config=ECORE_CONFIG_PATH  use ecore-config specified ],
-    [ECORE_CONFIG=$withval;
-     if ! test -x "$ECORE_CONFIG"; then
-       AC_MSG_ERROR([$ECORE_CONFIG not found])
-     fi],
-    [AC_PATH_PROG(ECORE_CONFIG, "ecore-config", "", $PATH)
-     if test -z "$ECORE_CONFIG"; then
-       AC_MSG_ERROR([You need ecore !])
-     fi])
-
-  ecore_cflags=`$ECORE_CONFIG --cflags`
-  ecore_libs=`$ECORE_CONFIG --libs`
-  
-  AC_SUBST(ecore_cflags)
-  AC_SUBST(ecore_libs)
-])
diff --git a/m4/ac_evas.m4 b/m4/ac_evas.m4
deleted file mode 100644
index 16feb10..0000000
--- a/m4/ac_evas.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-AC_DEFUN([AC_CHK_EVAS],
-[
-  AC_ARG_WITH(
-    [evas-config],
-    [  --with-evas-config=EVAS_CONFIG_PATH  use evas-config specified ],
-    [EVAS_CONFIG=$withval;
-     if ! test -x "$EVAS_CONFIG"; then
-       AC_MSG_ERROR([$EVAS_CONFIG not found])
-     fi],
-    [AC_PATH_PROG(EVAS_CONFIG, "evas-config", "", $PATH)
-     if test -z "$EVAS_CONFIG"; then
-       AC_MSG_ERROR([You need evas !])
-     fi])
-
-  evas_cflags=`$EVAS_CONFIG --cflags`
-  evas_libs=`$EVAS_CONFIG --libs`
-  
-  AC_SUBST(evas_cflags)
-  AC_SUBST(evas_libs)
-])