summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-05-07 11:26:49 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-05-07 11:26:49 +0100
commit5ac585848d90dc387e03acd68c7bdec13112fe83 (patch)
tree9ff43750a9c41f6caea1367c004bf7b4e218af7e
parentd6cc7dab2034f9f8eb7e841107f7249da47f7604 (diff)
Use idle's autogen.sh
-rwxr-xr-xautogen.sh40
1 files changed, 16 insertions, 24 deletions
diff --git a/autogen.sh b/autogen.sh
index 5b32d48..381e32f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,31 +1,23 @@
#!/bin/sh
set -e
-if test -n "$AUTOMAKE"; then
- : # don't override an explicit user request
-elif automake-1.11 --version >/dev/null 2>/dev/null && \
- aclocal-1.11 --version >/dev/null 2>/dev/null; then
- # If we have automake-1.11, use it. This is the oldest version (=> least
- # likely to introduce undeclared dependencies) that will give us
- # --enable-silent-rules support.
- AUTOMAKE=automake-1.11
- export AUTOMAKE
- ACLOCAL=aclocal-1.11
- export ACLOCAL
-fi
-
-autoreconf -i -f
+autoreconf -i -Wno-portability
-run_configure=true
-for arg in $*; do
- case $arg in
- --no-configure)
- run_configure=false
- ;;
- *)
- ;;
- esac
-done
+# Honor NOCONFIGURE for compatibility with gnome-autogen.sh
+if test x"$NOCONFIGURE" = x; then
+ run_configure=true
+ for arg in $*; do
+ case $arg in
+ --no-configure)
+ run_configure=false
+ ;;
+ *)
+ ;;
+ esac
+ done
+else
+ run_configure=false
+fi
if test $run_configure = true; then
./configure "$@"