Changeset 1830 for toiletTweet

Timestamp:

Sep 30, 2007, 5:44:21 PM (16 years ago)

Author:

Sam Hocevar

Message:

• New version of the bootstrap script.

File:

• toilet/trunk/bootstrap (modified) (4 diffs)

toilet/trunk/bootstrap

@@ -2 +2 @@
 
 # bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects
-# Copyright (c) 2002, 2003, 2004, 2005, 2006 Sam Hocevar <sam@zoy.org>
+# Copyright (c) 2002-2007 Sam Hocevar <sam@zoy.org>
 #
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of the Do What The Fuck You Want To
-#    Public License, Version 2, as published by Sam Hocevar. See
+#    This program is free software. It comes without any warranty, to
+#    the extent permitted by applicable law. You can redistribute it
+#    and/or modify it under the terms of the Do What The Fuck You Want
+#    To Public License, Version 2, as published by Sam Hocevar. See
 #    http://sam.zoy.org/wtfpl/COPYING for more details.
 #
@@ -26 +27 @@
 
 # Check for needed features
-auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *( *\([^ )]*\).*/\1/p' $conffile`"
+auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
 libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
 header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
@@ -33 +34 @@
 # Check for automake
 amvers="no"
-for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
-  if automake${v} --version >/dev/null 2>&1; then
-    amvers="${v}"
-    break
-  fi
+for n in 10 9 8 7 6 5; do
+  for v in "-1.${n}" "1${n}"; do
+    if automake${v} --version >/dev/null 2>&1; then
+      amvers="${v}"
+      break
+    fi
+  done
 done
 
@@ -95 +98 @@
     mkdir "$auxdir"
   fi
-  aclocalflags="${aclocalflags} -I $auxdir"
+  aclocalflags="${aclocalflags} -I $auxdir -I ."
 fi