diff options
| -rwxr-xr-x | build/buildcheck.sh | 3 | ||||
| -rwxr-xr-x | buildconf | 55 | ||||
| -rw-r--r-- | configure.in | 8 |
3 files changed, 31 insertions, 35 deletions
diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 2346ce02c..d0e2e26ed 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -55,9 +55,6 @@ if test "$1" = "1"; then lt_status="bad" fi fi -if test "$1" = "2"; then - lt_status="bad" -fi if test $lt_status = "good"; then echo "buildconf: libtool version $lt_pversion (ok)" exit 0 @@ -35,25 +35,20 @@ fi # Note: APR supplies its own config.guess and config.sub -- we do not # rely on libtool's versions # -echo "Copying libtool helper files ..." +echo "buildconf: copying libtool helper files using $libtoolize" # Remove any libtool files so one can switch between libtool 1.3 # and libtool 1.4 by simply rerunning the buildconf script. -(cd build ; rm -f ltconfig ltmain.sh libtool.m4) - -$libtoolize --copy --automake - -if [ -f libtool.m4 ]; then - ltfile=`pwd`/libtool.m4 -elif grep all_pkgmacro_files $libtoolize > /dev/null; then - # libtool 2.x - aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` - ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` - for f in $ltfiles; do - test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build - done - ltfile=$aclocal_dir/libtool.m4 -else +(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) + +lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` +lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` +IFS=.; set $lt_version; IFS=' ' +if test "$1" = "1"; then + $libtoolize --copy --automake + if [ -f libtool.m4 ]; then + ltfile=`pwd`/libtool.m4 + else ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ < $libtoolize`" ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} @@ -62,21 +57,17 @@ else ltpath=`dirname $libtoolize` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 fi -fi - -if [ ! -f $ltfile ]; then + fi + if [ ! -f $ltfile ]; then echo "$ltfile not found" exit 1 + fi + # Do we need this anymore? + echo "buildconf: Using libtool.m4 at ${ltfile}." + cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 fi - -echo "buildconf: Using libtool.m4 at ${ltfile}." - -cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 - -# libtool.m4 from 1.6 requires ltsugar.m4 -if [ -f ltsugar.m4 ]; then - rm -f build/ltsugar.m4 - mv ltsugar.m4 build/ltsugar.m4 +if test "$1" = "2"; then + $libtoolize --copy fi # Clean up any leftovers @@ -85,22 +76,22 @@ rm -f aclocal.m4 libtool.m4 # # Generate the autoconf header and ./configure # -echo "Creating include/arch/unix/apr_private.h.in ..." +echo "buildconf: creating include/arch/unix/apr_private.h.in ..." ${AUTOHEADER:-autoheader} -echo "Creating configure ..." +echo "buildconf: creating configure ..." ### do some work to toss config.cache? ${AUTOCONF:-autoconf} # Remove autoconf 2.5x's cache directory rm -rf autom4te*.cache -echo "Generating 'make' outputs ..." +echo "buildconf: generating 'make' outputs ..." build/gen-build.py make # Create RPM Spec file if [ -f `which cut` ]; then - echo rebuilding rpm spec file + echo "buildconf: rebuilding rpm spec file" ( REVISION=`build/get-version.sh all include/apr_version.h APR` VERSION=`echo $REVISION | cut -d- -s -f1` RELEASE=`echo $REVISION | cut -d- -s -f2` diff --git a/configure.in b/configure.in index 5ff3aa1e6..d14bcf504 100644 --- a/configure.in +++ b/configure.in @@ -9,6 +9,7 @@ AC_PREREQ(2.50) AC_INIT(build/apr_common.m4) AC_CONFIG_HEADER(include/arch/unix/apr_private.h) AC_CONFIG_AUX_DIR(build) +AC_CONFIG_MACRO_DIR(build) dnl dnl Include our own M4 macros along with those for libtool @@ -121,6 +122,8 @@ dnl can only be used once within a configure script, so this prevents a dnl preload section from invoking the macro to get compiler info. AC_PROG_CC +AC_PROG_SED + dnl Preload APR_PRELOAD @@ -164,6 +167,11 @@ echo "performing libtool configuration..." AC_ARG_ENABLE(experimental-libtool,[ --enable-experimental-libtool Use experimental custom libtool], [experimental_libtool=$enableval],[experimental_libtool=no]) +dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL +if test "x$Xsed" = "x"; then + Xsed="$SED -e 1s/^X//" +fi + case $host in *-os2*) # Use a custom-made libtool replacement |