X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=autogen.sh;h=820c457fe8f3a57cf1d861ec008678e1360fb17c;hb=aabe0f9d7d427097ddfc69ceb6f48999fcd01f60;hp=9eb6780a9d4fc8ceea9e8fa71c80d9318be06c55;hpb=993ffcdd0cb1ab956a456243241ae96eb2b398d1;p=fontconfig.git

diff --git a/autogen.sh b/autogen.sh
index 9eb6780..820c457 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,18 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+set -e
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
+case "$1" in
+--noconf*) 
+    	AUTOGEN_SUBDIR_MODE="true"
+	shift
+	;;
+esac
+
 ORIGDIR=`pwd`
 cd $srcdir
 PROJECT=Fontconfig
@@ -20,7 +29,7 @@ DIE=0
 
 have_libtool=false
 if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`$LIBTOOLIZE --version | sed 's/^[^0-9]*\([0-9].[0-9.]*\).*/\1/'`
+	libtool_version=`$LIBTOOLIZE --version | sed 's/^.* \([0-9][.][0-9.]*\)[^ ]*$/\1/'`
 	case $libtool_version in
 	    1.4*|1.5*|1.6*|1.7*|2*)
 		have_libtool=true
@@ -106,7 +115,7 @@ $AUTOCONF
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then
-	echo Running $srcdir/configure
+	echo Running $srcdir/configure --enable-maintainer-mode "$@"
         $srcdir/configure --enable-maintainer-mode "$@"
 
         echo