From 091a50a4e300700566e435f1029b76ebe882076c Mon Sep 17 00:00:00 2001 From: sam Date: Tue, 25 Aug 2009 14:23:46 +0000 Subject: [PATCH] Update bootstrap script (automake 1.11 and pkg-config detection). git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@3644 92316355-f0b4-4df1-b90c-862c8a59935f --- bootstrap | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/bootstrap b/bootstrap index 434d6e3..6e40f89 100755 --- a/bootstrap +++ b/bootstrap @@ -1,9 +1,9 @@ #! /bin/sh -# $Id: bootstrap 2005 2008-07-16 20:51:50Z sam $ +# $Id: bootstrap 3643 2009-08-25 14:23:08Z sam $ # bootstrap: generic bootstrap/autogen.sh script for autotools projects # -# Copyright (c) 2002-2008 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,6 +29,7 @@ fi # Check for needed features auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`" +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`" @@ -94,6 +95,14 @@ if test "$libtool" = "yes"; then fi fi +# Check for pkg-config +if test "$pkgconfig" = "yes"; then + if ! pkg-config --version >/dev/null 2>&1; then + echo "$0: you need pkg-config" + exit 1 + fi +fi + # Remove old cruft for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done rm -Rf autom4te.cache