2009-03-30 Tollef Fog Heen <tfheen@err.no>

	* autogen.sh: Allow not running configure, wanted by cygwin.

2 files changed, 16 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 7fc42dd..be748a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-03-30  Tollef Fog Heen  <tfheen@err.no>
 
+	* autogen.sh: Allow not running configure, wanted by cygwin.
+
 	* check/check-missing, check/check-libs,
 	check/check-requires-private: Handle the case of indirect being
 	enabled correctly in checks.
diff --git a/autogen.sh b/autogen.sh
index da5958b..b8fbac4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -80,9 +80,14 @@ perl -p -w -i.bak -e 's/if \(compare_func\(l1->data,l2->data\) < 0\)/if \(compar
 
 (cd glib-1.2.10 && libtoolize --copy --force && $ACLOCAL $ACLOCAL_FLAGS && $AUTOMAKE && $AUTOCONF) || exit 1
 
+run_configure=yes
 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."
+else
+    case "--no-configure" in
+	"*$") run_configure=no
+    esac
 fi
 
 libtoolize --copy --force
@@ -98,9 +103,12 @@ $AUTOCONF
 
 cd $ORIGDIR
 
-export AUTOMAKE
-export ACLOCAL
-$srcdir/configure --enable-maintainer-mode --disable-shared --disable-threads "$@"
-
-echo 
-echo "Now type 'make' to compile $PROJECT."
+if [ "$run_configure" = "yes" ]; then
+    export AUTOMAKE
+    export ACLOCAL
+    $srcdir/configure --enable-maintainer-mode --disable-shared --disable-threads "$@"
+    echo 
+    echo "Now type 'make' to compile $PROJECT."
+else
+    echo "Now type './configure && make' to compile $PROJECT."
+fi