X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=autogen.sh;h=1482e401c5113a767e43b007f45781f007bc8f03;hb=a4443e64c89256087d40462cfbb482950873e366;hp=c3d11caad731a36fde184132d5e5f36615480090;hpb=0596d7296c94b2bb9817338b8c1a76da91673fb9;p=platform%2Fupstream%2Ffontconfig.git

diff --git a/autogen.sh b/autogen.sh
index c3d11ca..1482e40 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,6 +19,7 @@ PROJECT=Fontconfig
 TEST_TYPE=-f
 FILE=fontconfig/fontconfig.h
 ACLOCAL=${ACLOCAL-aclocal}
+ACLOCAL_FLAGS="-I m4"
 LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
 AUTOMAKE=${AUTOMAKE-automake}
 AUTOHEADER=${AUTOHEADER-autoheader}
@@ -29,7 +30,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
@@ -85,7 +86,7 @@ test $TEST_TYPE $FILE || {
 	exit 1
 }
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then
         if test -z "$*"; then
                 echo "I am going to run ./configure with no arguments - if you wish "
                 echo "to pass any to it, please specify them on the $0 command line."
@@ -114,9 +115,9 @@ echo Running $AUTOCONF
 $AUTOCONF
 cd $ORIGDIR
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-	echo Running $srcdir/configure --enable-maintainer-mode "$@"
-        $srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then
+	echo Running $srcdir/configure "$@"
+        $srcdir/configure "$@"
 
         echo 
         echo "Now type 'make' to compile $PROJECT."