Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1412309 - in /apr/apr/branches/1.3.x: ./ CHANGES
 buildconf
Date: Wed, 21 Nov 2012 21:33:38 -0000
To: commits@apr.apache.org
From: rjung@apache.org
Message-Id: <20121121213339.15BD62388A66@eris.apache.org>

Author: rjung
Date: Wed Nov 21 21:33:37 2012
New Revision: 1412309

URL: http://svn.apache.org/viewvc?rev=1412309&view=rev
Log:
Merge buildconf improvements from trunk, 1.5.x, 1.4.x.

Trunk revisions: r836027, r955603, r1003781,
r1003783, r1125444, r1125475, r1125507, r1125527
1.5.x revisions: r1125485, r1125508, r1125529
1.4.x revisions: r1125489, r1125509, r1125528

Use buildconf script from trunk, works fine.
Changes:
- fixed indentation
- Correct and add a few comments
- Remove "$verbose" from libtool 1 call
  (it doesn't implement it)
- Reduce code duplication
- Remove "force" form libtoolize in order to
  not overwrite config.(guess|sub).
  All possibly conflicting old files get removed
  by buildconf before calling libtoolize.

Add forgotten argz.m4 to libtool m4 cleanup.

Fix nasty comment typo.

Modified:
    apr/apr/branches/1.3.x/   (props changed)
    apr/apr/branches/1.3.x/CHANGES
    apr/apr/branches/1.3.x/buildconf

Propchange: apr/apr/branches/1.3.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r836027,955603,1003781,1003783,1125444,1125475,1125507,1125527

Modified: apr/apr/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?rev=1412309&r1=1412308&r2=1412309&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.3.x/CHANGES [utf-8] Wed Nov 21 21:33:37 2012
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.3.13
 
+  *) Don't overwrite our config.guess and config.sub
+     when running buildconf.  [Rainer Jung]
+
   *) apr_mcast_hops: Fix EINVAL for IPv6 sockets caused by using byte
      instead integer for setsockopt. [Mladen Turk]
 

Modified: apr/apr/branches/1.3.x/buildconf
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/buildconf?rev=1412309&r1=1412308&r2=1412309&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/buildconf (original)
+++ apr/apr/branches/1.3.x/buildconf Wed Nov 21 21:33:37 2012
@@ -42,26 +42,38 @@ 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.
-(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4)
+# 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 argz.m4 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 --force $verbose
+  $libtoolize --copy --automake
+  # Unlikely, maybe for old versions the file exists
   if [ -f libtool.m4 ]; then 
     ltfile=`pwd`/libtool.m4
   else
-   ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
+
+    # Extract all lines setting variables from libtoolize up until
+    # libtool_m4 gets set
+    ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
                    < $libtoolize`"
-   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`
-     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
-   fi
+
+    # 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`
+      ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+    fi
   fi
   if [ ! -f $ltfile ]; then
     echo "$ltfile not found"
@@ -69,12 +81,21 @@ if test "$1" = "1"; then
   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
-if test "$1" = "2"; then
-  $libtoolize --copy --force $verbose
+  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, would 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