Author: wyoung
Date: Mon Dec 17 15:11:18 2007
New Revision: 2004
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2004&view=rev
Log:
- Removed reconf script. I haven't been using it, and as a one-liner,
it isn't even pulling its own weight as part of bootstrap.
- Split the big chain o' commands in bootstrap script into two halves
which must each succeed, allowing us to move some things which don't
have to succeed in between the two. The logic which was supposed to
allow these to be in the chain but not break the chain wasn't working
correctly.
Removed:
trunk/reconf
Modified:
trunk/bootstrap
trunk/mysql++.bkl
Modified: trunk/bootstrap
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/bootstrap?rev=2004&r1=2003&r2=2004&view=diff
==============================================================================
--- trunk/bootstrap (original)
+++ trunk/bootstrap Mon Dec 17 15:11:18 2007
@@ -42,19 +42,31 @@
done
rm -f config.cache
-set -x
-bakefilize &&
+# Do Bakefile stuff first
+set -x &&
+ bakefilize &&
bakefile_gen $BF_OPTIONS &&
- mv autoconf_inc.m4 config ;
bakefile -f gnu -o Makefile.simple -DBUILDLIBRARY=no mysql++.bkl &&
+ set +x &&
+ success=shonuff
+
+# If that succeeded, move on to autotools stuff, etc.
+if [ -n "$success" ]
+then
+ mv autoconf_inc.m4 config > /dev/null 2>&1 # don't care if it fails
+
+ success=
aclocal -I config -I /usr/local/share/aclocal &&
- autoheader &&
- autoconf &&
- ./reconf --enable-maintainer-mode $* &&
- make lib/custom.h lib/querydef.h &&
- set +x ; success=awyeah
+ autoheader &&
+ autoconf &&
+ ./configure --cache-file=config.cache --enable-maintainer-mode
$* &&
+ make lib/custom.h lib/querydef.h &&
+ set +x &&
+ success=awyeah
+fi
+# Detect failure in any part of above
if [ -z "$success" ]
then
echo BOOTSTRAP FAILED!
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2004&r1=2003&r2=2004&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Mon Dec 17 15:11:18 2007
@@ -364,7 +364,7 @@
COPYING CREDITS exrun* HACKERS INSTALL
install.bat \
install-sh libmysqlclient.def LICENSE
Makefile.* \
mysql++.* mysql++_*.ds? osver README*
rebake.bat \
- reconf Wishlist $(PKGNAME)
+ Wishlist $(PKGNAME)
</command>
<!-- config subdir -->
Removed: trunk/reconf
URL: http://svn.gna.org/viewcvs/mysqlpp/trunk/reconf?rev=2003&view=auto
==============================================================================
--- trunk/reconf (original)
+++ trunk/reconf (removed)
@@ -1,2 +1,0 @@
-#!/bin/sh
-./configure --cache-file=config.cache $*
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
