|
From: Enlightenment C. <no...@cv...> - 2007-03-21 22:23:08
|
Enlightenment CVS committal
Author : tilman
Project : e17
Module : apps/elicit
Dir : e17/apps/elicit
Modified Files:
configure.in
Log Message:
use pkgconfig to detect stuff
===================================================================
RCS file: /cvs/e/e17/apps/elicit/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- configure.in 10 Oct 2006 01:09:26 -0000 1.16
+++ configure.in 22 Mar 2007 04:23:04 -0000 1.17
@@ -60,90 +60,17 @@
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
-PROG="esmart-config";
-AC_PATH_PROG(ESMART_CONFIG, $PROG, "", $PATH)
-if test -z "$ESMART_CONFIG" ; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- AC_MSG_ERROR(Cannot find $PROG)
-fi
-esmart_cflags=`$ESMART_CONFIG --cflags`
-esmart_libs=`$ESMART_CONFIG --libs`
-AC_SUBST(esmart_cflags)
-AC_SUBST(esmart_libs)
-
-PROG="imlib2-config";
-AC_PATH_PROG(IMLIB2_CONFIG, $PROG, "", $PATH)
-if test -z "$IMLIB2_CONFIG" ; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- AC_MSG_ERROR(Cannot find $PROG)
-fi
-imlib2_cflags=`$IMLIB2_CONFIG --cflags`
-imlib2_libs=`$IMLIB2_CONFIG --libs`
-AC_SUBST(imlib2_cflags)
-AC_SUBST(imlib2_libs)
-
-PROG="evas-config";
-AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
-if test -z "$EVAS_CONFIG" ; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- AC_MSG_ERROR(Cannot find $PROG)
-fi
-evas_cflags=`$EVAS_CONFIG --cflags`
-evas_libs=`$EVAS_CONFIG --libs`
-AC_SUBST(evas_cflags)
-AC_SUBST(evas_libs)
-
-PROG="edb-config";
-AC_PATH_PROG(EDB_CONFIG, $PROG, "", $PATH)
-if test -z "$EDB_CONFIG" ; then
- edb_cflags=""
- edb_libs=""
-else
- AC_DEFINE(HAVE_EDB, 1, [Have edb])
- edb_cflags=`$EDB_CONFIG --cflags`
- edb_libs=`$EDB_CONFIG --libs`
-fi
-AC_SUBST(edb_cflags)
-AC_SUBST(edb_libs)
-
-PROG="eet-config";
-AC_PATH_PROG(EET_CONFIG, $PROG, "", $PATH)
-if test -z "$EET_CONFIG" ; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- AC_MSG_ERROR(Cannot find $PROG)
-fi
-eet_cflags=`$EET_CONFIG --cflags`
-eet_libs=`$EET_CONFIG --libs`
-AC_SUBST(eet_cflags)
-AC_SUBST(eet_libs)
-
-PROG="ecore-config";
-AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH)
-if test -z "$ECORE_CONFIG" ; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- AC_MSG_ERROR(Cannot find $PROG)
-fi
-ecore_cflags=`$ECORE_CONFIG --cflags`
-ecore_libs=`$ECORE_CONFIG --libs`
-AC_SUBST(ecore_cflags)
-AC_SUBST(ecore_libs)
-
-PROG="edje-config";
-AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH)
-if test -z "$EDJE_CONFIG" ; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- AC_MSG_ERROR(Cannot find $PROG)
-fi
-edje_cflags=`$EDJE_CONFIG --cflags`
-edje_libs=`$EDJE_CONFIG --libs`
-AC_SUBST(edje_cflags)
-AC_SUBST(edje_libs)
+PKG_CHECK_MODULES(ELICIT, [
+ imlib2
+ edb
+ evas
+ eet
+ esmart
+ ecore
+ ecore-config
+ ecore-evas
+ edje
+])
AC_OUTPUT([
Makefile
|