Changeset 2550

Timestamp:

07/16/08 22:53:14 (3 months ago)

Author:

sam

Message:

• bootstrap: update bootstrapping script for OpenSolaris? compatibility.
• check-utils: do not use grep -q, OpenSolaris? doesn't know about it.

Location:

zzuf/trunk

Files:

• bootstrap (modified) (3 diffs)
• test/check-utils (modified) (1 diff)

zzuf/trunk/bootstrap

@@ -1 +1 @@
 #! /bin/sh
+# $Id: bootstrap 2005 2008-07-16 20:51:50Z sam $
 
-# bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects
-# Copyright (c) 2002, 2003, 2004, 2005, 2006 Sam Hocevar <sam@zoy.org>
+# bootstrap: generic bootstrap/autogen.sh script for autotools projects
+#
+# Copyright (c) 2002-2008 Sam Hocevar <sam@zoy.org>
 #
 #    This program is free software. It comes without any warranty, to
@@ -27 +29 @@
 
 # Check for needed features
-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`"
-aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am`"
+auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
+libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo yes || echo no`"
+header="`grep '^[ \t]*A._CONFIG_HEADER' $conffile >/dev/null 2>&1 && echo yes || echo no`"
+makefile="`[ -f Makefile.am ] && echo yes || echo no`"
+aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/null || :`"
 
 # Check for automake
 amvers="no"
-for v in "-1.10" "110" "-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}"
+for v in 11 10 9 8 7 6 5; do
+  if automake-1.${v} --version >/dev/null 2>&1; then
+    amvers="-1.${v}"
+    break
+  elif automake1.${v} --version >/dev/null 2>&1; then
+    amvers="1.${v}"
     break
   fi
@@ -116 +122 @@
   autoheader${acvers}
 fi
-#add --include-deps if you want to bootstrap with any other compiler than gcc
-#automake${amvers} --add-missing --copy --include-deps
-automake${amvers} --foreign --add-missing --copy
+if test "$makefile" = "yes"; then
+  #add --include-deps if you want to bootstrap with any other compiler than gcc
+  #automake${amvers} --add-missing --copy --include-deps
+  automake${amvers} --foreign --add-missing --copy
+fi
 
 # Remove cruft that we no longer want

zzuf/trunk/test/check-utils

@@ -92 +92 @@
   exit 1
 fi
-if file /bin/cat | grep -q 'statically linked'; then
+if file /bin/cat | grep 'statically linked' >/dev/null 2>&1; then
   STATIC_CAT=1
 fi
-if file /bin/dd | grep -q 'statically linked'; then
+if file /bin/dd | grep 'statically linked' >/dev/null 2>&1; then
   STATIC_DD=1
 fi