Author: wyoung
Date: Fri Oct 26 22:14:53 2012
New Revision: 2709
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2709&view=rev
Log:
Small tweak to the bootstrap script that lets it find the native build
of Bakefile when you run it on Windows.
You still have to pound out the bakefilize line in the script for this
to work, though.
Modified:
trunk/bootstrap
Modified: trunk/bootstrap
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/bootstrap?rev=2709&r1=2708&r2=2709&view=diff
==============================================================================
--- trunk/bootstrap (original)
+++ trunk/bootstrap Fri Oct 26 22:14:53 2012
@@ -48,12 +48,13 @@
done
# Find location of Bakefile's stock M4 autoconf macros
-for d in /usr /usr/local
+for d in /usr/share/aclocal /usr/local/share/aclocal \
+ '/c/Program Files (x86)/Bakefile/autoconf'
do
- BAKEFILE_M4=$d/share/aclocal
- if [ -e $BAKEFILE_M4/bakefile.m4 ] ; then break ; fi
+ BAKEFILE_M4="$d"
+ if [ -e "$BAKEFILE_M4/bakefile.m4" ] ; then break ; fi
done
-if [ ! -e $BAKEFILE_M4/bakefile.m4 ]
+if [ ! -e "$BAKEFILE_M4/bakefile.m4" ]
then
echo
echo "Failed to find bakefile.m4. Add the directory containing"
@@ -80,7 +81,7 @@
rm -f config.cache
mv autoconf_inc.m4 config > /dev/null 2>&1 # don't care if it fails
set -x &&
- aclocal -I config -I $BAKEFILE_M4 &&
+ aclocal -I config -I "$BAKEFILE_M4" &&
libtoolize &&
autoheader &&
autoconf &&
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
