apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1125506 - in /apr/apr-util/branches/1.3.x/xml/expat: buildconf.sh configure.in
Date Fri, 20 May 2011 18:59:11 GMT
Author: rjung
Date: Fri May 20 18:59:11 2011
New Revision: 1125506

URL: http://svn.apache.org/viewvc?rev=1125506&view=rev
Log:
Sync expat buildconf mostly with apr buildconf.
sinclude m4 files in configure.in like we
do for apr instead of concatenating to aclocal.m4.
Backport of r1125504 from 1.5.x
resp. r1125505 from 1.4.x.

Modified:
    apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh
    apr/apr-util/branches/1.3.x/xml/expat/configure.in

Modified: apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh?rev=1125506&r1=1125505&r2=1125506&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh Fri May 20 18:59:11 2011
@@ -1,78 +1,104 @@
-#! /bin/sh
-
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
-# Find libtoolize. Prefer 1.x versions.
 #
-libtoolize=`conftools/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14`
+
+# buildconf: Build the support scripts needed to compile from a
+#            checked-out version of the source code.
+
+if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
+    verbose="--verbose"
+    shift
+fi
+
+libtoolize=`conftools/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
 if [ "x$libtoolize" = "x" ]; then
     echo "libtoolize not found in path"
     exit 1
 fi
 
-#
 # Create the libtool helper files
 #
-# Note: we copy (rather than link) the files.
+# Note: we copy (rather than link) them to simplify distribution.
+# Note: APR supplies its own config.guess and config.sub -- we do not
+#       rely on libtool's versions
 #
-# Note: This bundled version of expat will not always replace the
-# files since we have a special config.guess/config.sub that we
-# want to ensure is used.
-echo "Copying libtool helper files ..."
+echo "Copying libtool helper files using $libtoolize"
 
-# Remove any m4 cache and libtool files so one can switch between 
-# autoconf and libtool versions by simply rerunning the buildconf script.
-#
-m4files='lt~obsolete.m4 ltversion.m4 ltoptions.m4 argz.m4 ltsugar.m4 libtool.m4'
-
-(cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files)
+# Remove any libtool files so one can switch between libtool versions
+# by simply rerunning the buildconf script.
 rm -rf autom4te*.cache aclocal.m4
+m4files='argz.m4 libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4'
+(cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files)
 
-$libtoolize --copy --automake
-
-#
-# find libtool.m4
-#
-if [ ! -f libtool.m4 ]; then
-  ltpath=`dirname $libtoolize`
-  ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-  if [ -f $ltfile ]; then
-    echo "libtool.m4 found at $ltfile"
-    cp $ltfile conftools/libtool.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
+  # Unlikely, maybe for old versions the file exists
+  if [ -f libtool.m4 ]; then 
+    ltfile=`pwd`/libtool.m4
   else
-    echo "libtool.m4 not found - aborting!"
+
+    # 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`
+      ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+    fi
+  fi
+  if [ ! -f $ltfile ]; then
+    echo "$ltfile not found"
     exit 1
   fi
+  # Do we need this anymore?
+  echo "Using libtool.m4 at ${ltfile}."
+  rm -f conftools/libtool.m4
+  cp -p $ltfile conftools/libtool.m4
+
+# libtool 2
+elif test "$1" = "2"; then
+  $libtoolize --copy --quiet $verbose
 fi
 
-#
-# Build aclocal.m4 from libtool's m4 files
-#
-echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
-echo "dnl edits here will be lost" >> aclocal.m4
-
-for m4file in $m4files
-do
-  m4file=conftools/$m4file
-  if [ -f $m4file ]; then
-    echo "Incorporating $m4file into aclocal.m4 ..."
-    cat $m4file >> aclocal.m4
-    rm -f $m4file
-  fi
-done
-
 cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
 
 #
 # Generate the autoconf header template (config.h.in) and ./configure
 #
 echo "Creating config.h.in ..."
-${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
+${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning"
 
 echo "Creating configure ..."
 ### do some work to toss config.cache?
-${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
+${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning"
 
-# Remove autoconf caches
-rm -rf autom4te*.cache aclocal.m4
+# Clean up any leftovers and autoconf caches
+rm -rf autom4te*.cache aclocal.m4 libtool.m4
 
 exit 0

Modified: apr/apr-util/branches/1.3.x/xml/expat/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/configure.in?rev=1125506&r1=1125505&r2=1125506&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/configure.in (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/configure.in Fri May 20 18:59:11 2011
@@ -38,7 +38,16 @@ LIBAGE=5
 
 AC_CONFIG_HEADER(expat_config.h)
 
+dnl
+dnl Include our own M4 macros along with those for libtool
+dnl
 sinclude(conftools/ac_c_bigendian_cross.m4)
+sinclude(conftools/libtool.m4)
+sinclude(conftools/ltsugar.m4)
+sinclude(conftools/argz.m4)
+sinclude(conftools/ltoptions.m4)
+sinclude(conftools/ltversion.m4)
+sinclude(conftools/lt~obsolete.m4)
 
 AC_CANONICAL_SYSTEM
 



Mime
View raw message