1 files changed, 59 insertions, 16 deletions
diff --git a/configure.in b/configure.in
index b6b4081e7..3a879a2ad 100644
--- a/configure.in
+++ b/configure.in
@@ -103,27 +103,70 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-evas_cflags=`evas-config --cflags`
+dnl Check for Evas.
+AC_ARG_WITH(evas,
+        [  --with-evas=DIR          use evas in <DIR>],
+        [CFLAGS="$CFLAGS -I$withval/include"
+         LIBS="-L$withval/lib $LIBS"])
+
+AC_PATH_GENERIC(evas,, [
+    AC_SUBST(evas_libs)
+    AC_SUBST(evas_cflags)],
+    AC_MSG_ERROR(Cannot find edb: Is edb-config in path?))
 evas_libs=`evas-config --libs`
-edb_cflags=`edb-config --cflags`
+evas_cflags=`evas-config --cflags`
+
+dnl Check for Edb.
+AC_ARG_WITH(edb,
+        [  --with-edb=DIR          use edb in <DIR>],
+        [CFLAGS="$CFLAGS -I$withval/include"
+         LIBS="-L$withval/lib $LIBS"])
+
+AC_PATH_GENERIC(edb,, [
+    AC_SUBST(edb_libs)
+    AC_SUBST(edb_cflags)],
+    AC_MSG_ERROR(Cannot find edb: Is edb-config in path?))
 edb_libs=`edb-config --libs`
-ebits_cflags=`ebits-config --cflags`
+edb_cflags=`edb-config --cflags`
+
+dnl Check for Ebits.
+AC_ARG_WITH(ebits,
+        [  --with-ebits=DIR          use ebits in <DIR>],
+        [CFLAGS="$CFLAGS -I$withval/include"
+         LIBS="-L$withval/lib $LIBS"])
+
+AC_PATH_GENERIC(ebits,, [
+    AC_SUBST(ebits_libs)
+    AC_SUBST(ebits_cflags)],
+    AC_MSG_ERROR(Cannot find ebits: Is ebits-config in path?))
 ebits_libs=`ebits-config --libs`
-ecore_cflags=`ecore-config --cflags`
+ebits_cflags=`ebits-config --cflags`
+
+dnl Check for Ecore.
+AC_ARG_WITH(ecore,
+        [  --with-ecore=DIR          use ecore in <DIR>],
+        [CFLAGS="$CFLAGS -I$withval/include"
+         LIBS="-L$withval/lib $LIBS"])
+
+AC_PATH_GENERIC(ecore,, [
+    AC_SUBST(ecore_libs)
+    AC_SUBST(ecore_cflags)],
+    AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
 ecore_libs=`ecore-config --libs`
-efsd_cflags=`efsd-config --cflags`
-efsd_libs=`efsd-config --libs`
+ecore_cflags=`ecore-config --cflags`
+
+dnl Check for Efsd.
+AC_ARG_WITH(efsd,
+        [  --with-efsd=DIR          use efsd in <DIR>],
+        [CFLAGS="$CFLAGS -I$withval/include"
+         LIBS="-L$withval/lib $LIBS"])
 
-AC_SUBST(evas_cflags)
-AC_SUBST(evas_libs)
-AC_SUBST(edb_cflags)
-AC_SUBST(edb_libs)
-AC_SUBST(ebits_cflags)
-AC_SUBST(ebits_libs)
-AC_SUBST(ecore_cflags)
-AC_SUBST(ecore_libs)
-AC_SUBST(efsd_cflags)
-AC_SUBST(efsd_libs)
+AC_PATH_GENERIC(efsd,, [
+    AC_SUBST(efsd_libs)
+    AC_SUBST(efsd_cflags)],
+    AC_MSG_ERROR(Cannot find efsd: Is efsd-config in path?))
+efsd_libs=`efsd-config --libs`
+efsd_cflags=`efsd-config --cflags`
 
 AC_SUBST(CP_OPTIONS)