Bug 44826 - <alias> must contain only a single <family>

[fontconfig.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index d9bed63763cbba1d573d8a2327215650fe28358b..df4cd4142a48976959fa21f0f7240fe93423f768 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,6 +6,13 @@ 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
@@ -22,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
@@ -108,8 +115,8 @@ $AUTOCONF
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then
-       echo Running $srcdir/configure --enable-maintainer-mode "$@"
-        $srcdir/configure --enable-maintainer-mode "$@"
+       echo Running $srcdir/configure "$@"
+        $srcdir/configure "$@"
 
         echo 
         echo "Now type 'make' to compile $PROJECT."