DeforaNetworks/zzuf
3
0
Fork 0
Code Releases Activity

* bootstrap: update bootstrapping script for OpenSolaris compatibility.

Browse Source 
* check-utils: do not use grep -q, OpenSolaris doesn't know about it.
This commit is contained in:
Sam Hocevar 2008-07-16 20:53:14 +00:00 committed by sam
parent 48e7b55dfe
commit 22cd9da8fe
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bootstrap
View File

@ -1,7 +1,9 @@
#! /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
# the extent permitted by applicable law. You can redistribute it
@ -26,16 +28,20 @@ else
fi
# 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
done
@ -115,9 +121,11 @@ autoconf${acvers}
if test "$header" = "yes"; then
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
rm -Rf autom4te.cache

4
test/check-utils
View File

@ -91,10 +91,10 @@ if [ ! -f "$ZZCAT" ]; then
echo "error: test/zzcat is missing"
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
FAILED=0