Changeset 2550 for zzuf/trunk


Ignore:
Timestamp:
Jul 16, 2008, 10:53:14 PM (12 years ago)
Author:
Sam Hocevar
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:
2 edited

Legend:

Unmodified
Added
Removed
  • zzuf/trunk/bootstrap

    r1617 r2550  
    11#! /bin/sh
     2# $Id: bootstrap 2005 2008-07-16 20:51:50Z sam $
    23
    3 # bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects
    4 # Copyright (c) 2002, 2003, 2004, 2005, 2006 Sam Hocevar <sam@zoy.org>
     4# bootstrap: generic bootstrap/autogen.sh script for autotools projects
     5#
     6# Copyright (c) 2002-2008 Sam Hocevar <sam@zoy.org>
    57#
    68#    This program is free software. It comes without any warranty, to
     
    2729
    2830# Check for needed features
    29 auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *( *\([^ )]*\).*/\1/p' $conffile`"
    30 libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
    31 header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
    32 aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am`"
     31auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
     32libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo yes || echo no`"
     33header="`grep '^[ \t]*A._CONFIG_HEADER' $conffile >/dev/null 2>&1 && echo yes || echo no`"
     34makefile="`[ -f Makefile.am ] && echo yes || echo no`"
     35aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/null || :`"
    3336
    3437# Check for automake
    3538amvers="no"
    36 for v in "-1.10" "110" "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
    37   if automake${v} --version >/dev/null 2>&1; then
    38     amvers="${v}"
     39for v in 11 10 9 8 7 6 5; do
     40  if automake-1.${v} --version >/dev/null 2>&1; then
     41    amvers="-1.${v}"
     42    break
     43  elif automake1.${v} --version >/dev/null 2>&1; then
     44    amvers="1.${v}"
    3945    break
    4046  fi
     
    116122  autoheader${acvers}
    117123fi
    118 #add --include-deps if you want to bootstrap with any other compiler than gcc
    119 #automake${amvers} --add-missing --copy --include-deps
    120 automake${amvers} --foreign --add-missing --copy
     124if test "$makefile" = "yes"; then
     125  #add --include-deps if you want to bootstrap with any other compiler than gcc
     126  #automake${amvers} --add-missing --copy --include-deps
     127  automake${amvers} --foreign --add-missing --copy
     128fi
    121129
    122130# Remove cruft that we no longer want
  • zzuf/trunk/test/check-utils

    r2548 r2550  
    9292  exit 1
    9393fi
    94 if file /bin/cat | grep -q 'statically linked'; then
     94if file /bin/cat | grep 'statically linked' >/dev/null 2>&1; then
    9595  STATIC_CAT=1
    9696fi
    97 if file /bin/dd | grep -q 'statically linked'; then
     97if file /bin/dd | grep 'statically linked' >/dev/null 2>&1; then
    9898  STATIC_DD=1
    9999fi
Note: See TracChangeset for help on using the changeset viewer.