Author: brane
Date: Mon Nov 10 12:28:10 2014
New Revision: 1637826
URL: http://svn.apache.org/r1637826
Log:
Fix incorrect expansion/replacement of the LIBTOOL_M4 and LIBTOOL_CONFIG
environment variables in autogen.sh.
* autogen.sh (ltfile, configfile): The file basename we're searching for
must not be part of the replacement expansion when LIBTOOL_M4 or
LIBTOOL_CONFIG are not defined.
Modified:
subversion/trunk/autogen.sh
Modified: subversion/trunk/autogen.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/autogen.sh?rev=1637826&r1=1637825&r2=1637826&view=diff
==============================================================================
--- subversion/trunk/autogen.sh (original)
+++ subversion/trunk/autogen.sh Mon Nov 10 12:28:10 2014
@@ -72,7 +72,7 @@ rm -f build/config.guess build/config.su
$libtoolize --copy --automake --force
ltpath="`dirname $libtoolize`"
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`}/libtool.m4
if [ ! -f $ltfile ]; then
echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
@@ -92,7 +92,7 @@ for file in ltoptions.m4 ltsugar.m4 ltve
rm -f build/$file
if [ $lt_major_version -ge 2 ]; then
- ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/$file}
+ ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`}/$file
if [ ! -f $ltfile ]; then
echo "$ltfile not found (try setting the LIBTOOL_M4 environment
variable)"
@@ -106,7 +106,7 @@ done
if [ $lt_major_version -ge 2 ]; then
for file in config.guess config.sub; do
- configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ;
pwd`/$file}
+ configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ;
pwd`}/$file
if [ ! -f $configfile ]; then
echo "$configfile not found (try setting the LIBTOOL_CONFIG
environment variable)"
