summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@err.no>2009-03-30 22:06:58 +0200
committerTollef Fog Heen <tfheen@err.no>2009-03-30 22:06:58 +0200
commit9b49307caed60772474f54eb6b2cc8af22132293 (patch)
tree9f5940dbf8d595282968b514acd723886ecf0b1c /autogen.sh
parente4d39435b9819f36eb9951ecdc9d02d57e75a065 (diff)
downloadpkg-config-9b49307caed60772474f54eb6b2cc8af22132293.tar.gz
2009-03-30 Tollef Fog Heen <tfheen@err.no>
* autogen.sh: Allow not running configure, wanted by cygwin.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh20
1 files changed, 14 insertions, 6 deletions
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