Minor cleanups in buildconf:

- Correct and add a few comments
- Remove "$verbose" from libtool 1 call
  (it doesn't implement it)
- Reduce code duplication

Will backport to 1.5 and 1.4 after more testing.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1125475 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 27 insertions, 11 deletions

diff --git a/buildconf b/buildconf
index ba5a8a138..2fa18a8be 100755
--- a/buildconf
+++ b/buildconf
@@ -42,21 +42,33 @@ fi
 #
 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.
+# Remove any libtool files so one can switch between libtool versions
+# by simply rerunning the buildconf script.
+rm -f aclocal.m4 libtool.m4
 (cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4)
 
+# Determine libtool version, because --copy behaves differently
+# w.r.t. copying libtool.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=' '
+
+# libtool 1
 if test "$1" = "1"; then
-  $libtoolize --copy --automake $verbose
+  $libtoolize --copy --automake
+  # Unlikely, maybe for old versions the file exists
   if [ -f libtool.m4 ]; then 
     ltfile=`pwd`/libtool.m4
   else
+
+    # Extract all lines setting variables from libtoolize up until
+    # libtool_m4 gets set
     ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
                    < $libtoolize`"
+
+    # Get path to libtool.m4 either from LIBTOOL_M4 env var or our libtoolize based script
     ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`}
+
     # Expecting the code above to be very portable, but just in case...
     if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
       ltpath=`dirname $libtoolize`
@@ -70,16 +82,20 @@ if test "$1" = "1"; then
   # Do we need this anymore?
   echo "buildconf: Using libtool.m4 at ${ltfile}."
   rm -f build/libtool.m4
-  cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
-fi
-if test "$1" = "2"; then
-  $libtoolize --copy --automake $verbose
-  # Wouldn't it just be better to define top_builddir??
-  mv build/libtool.m4 build/libtool.m4.$$
-  cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
-  rm -f build/libtool.m4.$$
+  cp -p $ltfile build/libtool.m4
+
+# libtool 2
+elif test "$1" = "2"; then
+  $libtoolize --copy --quiet $verbose
 fi
 
+# Replace top_builddir by apr_builddir.
+# Wouldn't it just be better to define top_builddir??
+# Not sure, wuld it interfere with httpd top_builddir when bundled?
+mv build/libtool.m4 build/libtool.m4.$$
+sed -e 's/\(LIBTOOL=.*\)top_build/\1apr_build/' < build/libtool.m4.$$ > build/libtool.m4
+rm -f build/libtool.m4.$$
+
 # Clean up any leftovers
 rm -f aclocal.m4 libtool.m4