Enlightenment CVS committal

Author  : atmosphere
Project : misc
Module  : engage

Dir     : misc/engage


Modified Files:
        configure.in 
Added Files:
        acinclude.m4 


Log Message:
use AC_PATH_GENERIC
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in        14 Apr 2004 22:59:15 -0000      1.6
+++ configure.in        18 Apr 2004 17:46:08 -0000      1.7
@@ -79,59 +79,57 @@
   AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [PACKAGE_LIB_DIR])
 fi
 
-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.";
-  echo "FATAL ERROR. ABORT.";
-  exit -1;
-fi
-esmart_cflags=`$ESMART_CONFIG --cflags`
-esmart_libs=`$ESMART_CONFIG --libs`
-AC_SUBST(esmart_cflags)
+AC_PATH_GENERIC(esmart, 0.0.2, [
+       AC_SUBST(esmart_libs)
+       AC_SUBST(esmart_cflags) ],
+       AC_MSG_ERROR(Cannot find edb: Is esmart-config in path?))
+esmart_libs=`esmart-config --libs`
+esmart_cflags=`esmart-config --cflags`
 AC_SUBST(esmart_libs)
+AC_SUBST(esmart_cflags)
 
-PROG="imlib2-config";
-AC_PATH_PROG(IMLIB_CONFIG, $PROG, "", $PATH)
-if [ test -z $IMLIB_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.";
-  echo "FATAL ERROR. ABORT.";
-  exit -1;
-fi
-imlib_cflags=`$IMLIB_CONFIG --cflags`
-imlib_libs=`$IMLIB_CONFIG --libs`
-AC_SUBST(imlib_cflags)
-AC_SUBST(imlib_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.";
-  echo "FATAL ERROR. ABORT.";
-  exit -1;
-fi
-edje_cflags=`$EDJE_CONFIG --cflags`
-edje_libs=`$EDJE_CONFIG --libs`
-AC_SUBST(edje_cflags)
+have_imlib="no"
+AC_PATH_GENERIC(imlib2, 1.1.1, [
+       AC_DEFINE(HAVE_IMLIB, [], [Imlib Image Manipulation Support])
+       have_imlib="yes"
+       AC_SUBST(imlib2_libs)
+       AC_SUBST(imlib2_cflags) ],
+       AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in path?))
+imlib2_libs=`imlib2-config --libs`
+imlib2_cflags=`imlib2-config --cflags`
+AC_SUBST(imlib2_libs)
+AC_SUBST(imlib2_cflags)
+
+AC_PATH_GENERIC(edje, 0.5.0, [
+       AC_SUBST(edje_libs)
+       AC_SUBST(edje_cflags) ],
+       AC_MSG_ERROR(Cannot find edje: Is edje-config in path?))
+edje_libs=`edje-config --libs`
+edje_cflags=`edje-config --cflags`
 AC_SUBST(edje_libs)
+AC_SUBST(edje_cflags)
 
+AC_PATH_GENERIC(ecore, 1.0.0, [
+       AC_SUBST(ecore_libs)
+       AC_SUBST(ecore_cflags) ],
+       AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
+ecore_libs=`ecore-config --libs`
+ecore_cflags=`ecore-config --cflags`
+AC_SUBST(ecore_libs)
+AC_SUBST(ecore_cflags)
 
-dnl Set PACKAGE_SOURCE_DIR in config.h.
-#packagesrcdir=`cd $srcdir && pwd`
-#AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "$packagesrcdir", [PACKAGE_SOURCE_DIR]])
-
-evas_cflags=`evas-config --cflags`
+AC_PATH_GENERIC(evas, 1.0.3, [
+       AC_SUBST(evas_libs)
+       AC_SUBST(evas_cflags) ],
+       AC_MSG_ERROR(Cannot find evas: Is evas-config in path?))
 evas_libs=`evas-config --libs`
-AC_SUBST(evas_cflags)
+evas_cflags=`evas-config --cflags`
 AC_SUBST(evas_libs)
+AC_SUBST(evas_cflags)
 
-ecore_cflags=`ecore-config --cflags`
-ecore_libs=`ecore-config --libs`
-AC_SUBST(ecore_cflags)
-AC_SUBST(ecore_libs)
+dnl Set PACKAGE_SOURCE_DIR in config.h.
+#packagesrcdir=`cd $srcdir && pwd`
+#AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "$packagesrcdir", [PACKAGE_SOURCE_DIR]])
 
 have_esmart_trans="no"
 dnl Make sure the esmart header/lib is available
@@ -140,15 +138,6 @@
     have_esmart_trans="yes"  
   ])
 
-have_imlib="no"
-dnl Make sure the imlib header/lib is available
-AC_CHECK_HEADER( Imlib2.h,
-  [ AC_DEFINE(HAVE_IMLIB, [], [Imlib Image Manipulation support])
-    have_imlib="yes"
-  ])
-
-
-
 AC_OUTPUT([
 Makefile
 src/Makefile




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to