Author: wyoung
Date: Fri Dec 28 10:33:32 2007
New Revision: 2035
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2035&view=rev
Log:
Auto-detecting location of bakefile.m4 in bootstrap script instead of
hard-coding it.
Modified:
trunk/bootstrap
Modified: trunk/bootstrap
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/bootstrap?rev=2035&r1=2034&r2=2035&view=diff
==============================================================================
--- trunk/bootstrap (original)
+++ trunk/bootstrap Fri Dec 28 10:33:32 2007
@@ -56,8 +56,24 @@
then
mv autoconf_inc.m4 config > /dev/null 2>&1 # don't care if it fails
+ # Find location of Bakefile's stock M4 autoconf macros
+ for d in /usr /usr/local
+ do
+ BAKEFILE_M4=$d/share/aclocal
+ if [ -e $BAKEFILE_M4/bakefile.m4 ] ; then break ; fi
+ done
+ if [ ! -e $BAKEFILE_M4/bakefile.m4 ]
+ then
+ echo
+ echo "Failed to find bakefile.m4. Add the directory containing"
+ echo "this to the bootstrap script."
+ echo
+ exit 1
+ fi
+
success=
- aclocal -I config -I /usr/local/share/aclocal &&
+ set -x &&
+ aclocal -I config -I $BAKEFILE_M4 &&
autoheader &&
autoconf &&
./configure --cache-file=config.cache --enable-maintainer-mode
$* &&
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
