new autogen

Original commit message from CVS:
new autogen

1 files changed, 17 insertions, 12 deletions

diff --git a/autogen.sh b/autogen.sh
index 979eac3a2f..f8c1c149a2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -28,6 +28,7 @@ version_check ()
   MINOR=$4
   MICRO=$5
 
+  WRONG=
 
   debug "major $MAJOR minor $MINOR micro $MICRO"
   VERSION=$MAJOR
@@ -35,7 +36,7 @@ version_check ()
   if test ! -z "$MICRO"; then VERSION=$VERSION.$MICRO; else MICRO=0; fi
 
   debug "major $MAJOR minor $MINOR micro $MICRO"
-  echo -n "+ checking for $1 > $VERSION ... "
+  echo -n "+ checking for $1 >= $VERSION ... "
   ($PACKAGE --version) < /dev/null > /dev/null 2>&1 || 
   {
 	echo
@@ -72,13 +73,13 @@ version_check ()
   fi
 
   if test ! -z "$WRONG"; then
-    echo " found $pkg_version, not ok !"
+    echo "found $pkg_version, not ok !"
     echo
     echo "You must have $PACKAGE $VERSION or greater to compile $package."
     echo "Get the latest version from $URL"
     return 1
   else
-    echo " found $pkg_version, ok."
+    echo "found $pkg_version, ok."
   fi
 }
 
@@ -96,7 +97,7 @@ fi
 version_check "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
 version_check "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1
 version_check "libtool" "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1
-version_check "pkg-config" "http://www.freedesktop.org/software/pkgconfig" 0 7 0 || DIE=1
+version_check "pkg-config" "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
 
 if test "$DIE" -eq 1; then
 	exit 1
@@ -112,9 +113,8 @@ if test -z "$*"; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
-# FIXME : why does libtoolize keep complaining about aclocal ?
-echo "+ running libtoolize ..."
-libtoolize --copy --force
+echo "+ creating acinclude.m4"
+cat m4/*.m4 > acinclude.m4
 
 echo "+ running aclocal ..."
 aclocal $ACLOCAL_FLAGS || {
@@ -122,6 +122,11 @@ aclocal $ACLOCAL_FLAGS || {
 	echo "aclocal failed - check that all needed development files are present on system"
 	exit 1
 }
+
+# FIXME : why does libtoolize keep complaining about aclocal ?
+echo "+ running libtoolize ..."
+libtoolize --copy --force
+
 echo "+ running autoheader ... "
 autoheader || {
 	echo
@@ -132,18 +137,18 @@ echo "+ running autoconf ... "
 autoconf || {
 	echo
 	echo "autoconf failed"
-	#exit 1
+	exit 1
 }
 echo "+ running automake ... "
-automake --add-missing || {
+automake -a -c || {
 	echo
 	echo "automake failed"
-	#exit 1
+	exit 1
 }
 
 # now remove the cache, because it can be considered dangerous in this case
-echo "+ removing config.cache ... "
-rm -f config.cache
+#echo "+ removing config.cache ... "
+#rm -f config.cache
 
 CONFIGURE_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-debug --enable-DEBUG'