From 675a9e149f35d0bacf5aaeec3fdad9c412bb44f2 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 25 Aug 2009 14:23:08 +0000 Subject: [PATCH] Update bootstrap script (automake 1.11 and pkg-config detection). --- bootstrap | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/bootstrap b/bootstrap index 53ba8ab..aec61d0 100755 --- a/bootstrap +++ b/bootstrap @@ -3,7 +3,7 @@ # bootstrap: generic bootstrap/autogen.sh script for autotools projects # -# Copyright (c) 2002-2007 Sam Hocevar +# Copyright (c) 2002-2009 Sam Hocevar # # This program is free software. It comes without any warranty, to # the extent permitted by applicable law. You can redistribute it @@ -29,14 +29,15 @@ 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`" -pkgconfig="`grep -q '^[ \t]*PKG_PROG_PKG_CONFIG' $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`" +pkgconfig="`grep '^[ \t]*PKG_PROG_PKG_CONFIG' $conffile >/dev/null 2>&1 && 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 || :`" # Check for automake amvers="no" -for v in 10 9 8 7 6 5; do +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 @@ -129,9 +130,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