From 4e5e0b097473a4fccda61ea4915cd9de792e3494 Mon Sep 17 00:00:00 2001 From: xcomputerman Date: Tue, 23 Dec 2003 04:58:47 +0000 Subject: [PATCH] Add edb-checking option, and attempt to properly handle Edb cflags without causing compile-time errors for ecore_config SVN revision: 8196 --- legacy/ecore/configure.in | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in index f2497652ca..7582c56995 100644 --- a/legacy/ecore/configure.in +++ b/legacy/ecore/configure.in @@ -288,6 +288,7 @@ ecore_evas_libs=""; evas_cflags=""; evas_libs=""; + AC_ARG_WITH(evas-config, [ --with-evas-config=EVAS_CONFIG use evas-config specified ], [ @@ -488,6 +489,25 @@ if test "x$have_ecore_config" = "xyes"; then AM_CONDITIONAL(BUILD_ECORE_CONFIG, true) AC_DEFINE(BUILD_ECORE_CONFIG) ecore_config_libs="-lecore_config"; + AC_ARG_WITH(edb-config, + [ --with-edb-config=EDB_CONFIG use edb-config specified ], + [ + PROG_CONFIG=$withval; + echo "using "$PROG_CONFIG" for edb-config"; + ],[ + PROG="edb-config"; + AC_PATH_PROG(PROG_CONFIG, $PROG, "", $PATH) + ]) + EDB_CONFIG=$PROG_CONFIG + + AC_CHECK_LIB(edb, e_db_open, + [ + edb_cflags=`edb-config --cflags` + edb_libs=`edb-config --libs` + ] + ) + AC_SUBST(edb_libs) + AC_SUBST(edb_cflags) else AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) fi @@ -495,11 +515,6 @@ fi AC_SUBST(ecore_config_cflags) AC_SUBST(ecore_config_libs) -edb_libs=`edb-config --libs` -edb_cflags=`edb-config --cflags` -AC_SUBST(edb_libs) -AC_SUBST(edb_cflags) - AC_OUTPUT([ Makefile ecore-config