Changeset 44

Timestamp:

Aug 24, 2009, 1:47:11 PM (15 years ago)

Author:

buchmann

Message:

Update bootstrap and Makefile.am

Location:

sources

Files:

• Makefile.am (modified) (1 diff)
• bootstrap (modified) (2 diffs)

sources/Makefile.am

@@ +1 @@
+ACLOCAL_AMFLAGS= -I m4
 SUBDIRS = src examples doc

sources/bootstrap

@@ -1 +1 @@
 #! /bin/sh
-# $Id: bootstrap 1974 2008-04-04 11:32:24Z sam $
+# $Id: bootstrap 2005 2008-07-16 20:51:50Z sam $
 
 # bootstrap: generic bootstrap/autogen.sh script for autotools projects
@@ -30 +30 @@
 # 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`"
+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 || :`"