Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/exml
Dir : e17/libs/exml
Modified Files:
Makefile.am autogen.sh configure.in
Log Message:
use ac_path_geenric.m4 to detect ecore, libxml2 and xslt
===================================================================
RCS file: /cvs/e/e17/libs/exml/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 18 Apr 2006 23:04:14 -0000 1.4
+++ Makefile.am 31 Jul 2006 10:48:57 -0000 1.5
@@ -4,6 +4,7 @@
EXTRA_DIST = \
README AUTHORS COPYING exml.pc.in \
+ m4/ac_path_generic.m4 \
debian/changelog \
debian/changelog.in \
debian/control \
===================================================================
RCS file: /cvs/e/e17/libs/exml/autogen.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- autogen.sh 11 Feb 2006 05:15:20 -0000 1.5
+++ autogen.sh 31 Jul 2006 10:48:57 -0000 1.6
@@ -5,7 +5,7 @@
touch README
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
+echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
echo "Running autoheader..." ; autoheader || exit 1
echo "Running autoconf..." ; autoconf || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize
--automake) || exit 1
===================================================================
RCS file: /cvs/e/e17/libs/exml/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- configure.in 31 Jul 2006 10:05:56 -0000 1.9
+++ configure.in 31 Jul 2006 10:48:57 -0000 1.10
@@ -54,41 +54,20 @@
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code
directory])
-PROG="ecore-config";
-AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH)
-if test "x$ECORE_CONFIG" = "x" ; 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)
+AC_PATH_GENERIC(ecore, 0.9.9,
+ [ ],
+ [ AC_MSG_ERROR(Make sure that ecore-config is in your PATH or that Ecore is
correctly installed) ],
+)
-PROG="xml2-config";
-AC_PATH_PROG(XML2_CONFIG, $PROG, "", $PATH)
-if test "x$XML2_CONFIG" = "x" ; 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
-xml2_cflags=`$XML2_CONFIG --cflags`
-xml2_libs=`$XML2_CONFIG --libs`
-AC_SUBST(xml2_cflags)
-AC_SUBST(xml2_libs)
+AC_PATH_GENERIC(xml2, 2.6.13,
+ [ ],
+ [ AC_MSG_ERROR(Make sure that ecore-config is in your PATH or that Libxml2
is correctly installed) ],
+)
-PROG="xslt-config";
-AC_PATH_PROG(XSLT_CONFIG, $PROG, "", $PATH)
-if test "x$XSLT_CONFIG" = "x" ; 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
-xslt_cflags=`$XSLT_CONFIG --cflags`
-xslt_libs=`$XSLT_CONFIG --libs`
-AC_SUBST(xslt_cflags)
-AC_SUBST(xslt_libs)
+AC_PATH_GENERIC(xslt, 1.1.10,
+ [ ],
+ [ AC_MSG_ERROR(Make sure that ecore-config is in your PATH or that Xslt is
correctly installed) ],
+)
AC_OUTPUT([
Makefile
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
