From aaea5afb2197484a8d86ed1473a42a92fd648025 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 18 Dec 2010 05:46:13 -0700 Subject: [PATCH] Author: Henrik Nordstrom Make bootstrap.sh use system default autotools versions instead of searching - can be overridden on commandline if needed. See bootstrap.sh for details. - Update autoconf to 2.68 - Rename configure.ac to match current autotools standards --- bootstrap.sh | 36 ++++++------------- configure.in => configure.ac | 0 .../{configure.in => configure.ac} | 0 lib/libTrie/INSTALL | 2 +- lib/libTrie/{configure.in => configure.ac} | 0 mkrelease.sh | 2 +- src/StoreFileSystem.h | 4 +-- test-suite/buildtests/layer-01-minimal.opts | 6 ++-- test-suite/buildtests/layer-02-maximus.opts | 6 ++-- 9 files changed, 20 insertions(+), 36 deletions(-) rename configure.in => configure.ac (100%) rename helpers/negotiate_auth/squid_kerb_auth/{configure.in => configure.ac} (100%) rename lib/libTrie/{configure.in => configure.ac} (100%) diff --git a/bootstrap.sh b/bootstrap.sh index 933ff33314..b41b147f40 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Used to setup the configure.in, autoheader and Makefile.in's if configure +# Used to setup the configure.ac, autoheader and Makefile.in's if configure # has not been generated. This script is only needed for developers when # configure has not been run, or if a Makefile.am in a non-configured directory # has been updated @@ -7,9 +7,9 @@ # Autotool versions preferred. To override either edit the script # to match the versions you want to use, or set the variables on # the command line like "env acver=.. amver=... ./bootstrap.sh" -acversions="${acver:-2.64 2.63 2.62 2.61}" -amversions="${amver:-1.11 1.10 1.9}" -ltversions="${ltver:-2.2}" +acversions="${acver:-.}" # 2.68 2.67 2.66 2.65 2.64 2.63 2.62 2.61}" +amversions="${amver:-.}" # 1.11 1.10 1.9}" +ltversions="${ltver:-.}" # 2.2}" check_version() { @@ -19,24 +19,8 @@ check_version() show_version() { tool=$1 - found="NOT_FOUND" - shift - versions="$*" - for version in $versions; do - for variant in "" "-${version}" "`echo $version | sed -e 's/\.//g'`"; do - if check_version $tool ${tool}${variant} $version; then - found="${version}" - break - fi - done - if [ "x$found" != "xNOT_FOUND" ]; then - break - fi - done - if [ "x$found" = "xNOT_FOUND" ]; then - found="??" - fi - echo $found + variant=$2 + ${tool}${variant} --version 2>/dev/null | head -1 | sed -e 's/.*) //' } find_variant() @@ -92,7 +76,7 @@ bootstrap_libtoolize() { # TODO: when we have libtool2, tell libtoolize where to put its files # instead of manualy moving files from ltdl to lib/libLtdl - if egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.in + if egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.ac then ltdl="--ltdl" else @@ -122,9 +106,9 @@ acver=`find_variant autoconf ${acversions}` ltver=`find_variant libtool ${ltversions}` # Produce debug output about what version actually found. -amversion=`show_version automake ${amversions}` -acversion=`show_version autoconf ${acversions}` -ltversion=`show_version libtool ${ltversions}` +amversion=`show_version automake "${amver}"` +acversion=`show_version autoconf "${acver}"` +ltversion=`show_version libtool "${ltver}"` # Find the libtool path to get the right aclocal includes ltpath=`find_path libtool$ltver` diff --git a/configure.in b/configure.ac similarity index 100% rename from configure.in rename to configure.ac diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.in b/helpers/negotiate_auth/squid_kerb_auth/configure.ac similarity index 100% rename from helpers/negotiate_auth/squid_kerb_auth/configure.in rename to helpers/negotiate_auth/squid_kerb_auth/configure.ac diff --git a/lib/libTrie/INSTALL b/lib/libTrie/INSTALL index a4b34144dc..46dd6d005f 100644 --- a/lib/libTrie/INSTALL +++ b/lib/libTrie/INSTALL @@ -31,7 +31,7 @@ be considered for the next release. If you are using the cache, and at some point `config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create + The file `configure.ac' is used to create `configure' by a program called `autoconf'. You only need `configure.ac' if you want to change it or regenerate `configure' using a newer version of `autoconf'. diff --git a/lib/libTrie/configure.in b/lib/libTrie/configure.ac similarity index 100% rename from lib/libTrie/configure.in rename to lib/libTrie/configure.ac diff --git a/mkrelease.sh b/mkrelease.sh index d1e8c3df70..9ddb8ee297 100755 --- a/mkrelease.sh +++ b/mkrelease.sh @@ -53,7 +53,7 @@ if [ ${name} != ${PACKAGE}-${VERSION} ]; then exit 1 fi RELEASE=`echo $VERSION | cut -d. -f1,2 | cut -d- -f1` -ed -s configure.in <disable.opts +# The options for this level can be easily generated semi-automatically from configure.ac by: +# grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts # followed by insertion of ' --disable-' and '\' strings # -# grep -E "^AC_ARG_WITH" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts +# grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts # followed by insertion of ' --without-' and ' \' strings # # sometimes it's just too automatic.. Following options should be just stripped diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts index dccac192c7..779c121c85 100644 --- a/test-suite/buildtests/layer-02-maximus.opts +++ b/test-suite/buildtests/layer-02-maximus.opts @@ -9,11 +9,11 @@ MAKETEST="distcheck" # # -# The options for this level can be easily generated semi-automatically from configure.in by: -# grep -E "^AC_ARG_ENABLE" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts +# The options for this level can be easily generated semi-automatically from configure.ac by: +# grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts # followed by insertion of ' --enable-' and '\' strings # -# grep -E "^AC_ARG_WITH" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts +# grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts # followed by insertion of ' --with-' and ' \' strings # # sometimes it's just too automatic.. -- 2.47.2