Changeset: 8c905354b259 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c905354b259
Modified Files:
Branch: default
Log Message:
Merged from Mar2011
diffs (50 lines):
diff --git a/bootstrap b/bootstrap
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,4 @@
-# -*-shell-script-*-
+#!/usr/bin/env bash
# The contents of this file are subject to the MonetDB Public License
# Version 1.1 (the "License"); you may not use this file except in
@@ -17,9 +17,29 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
+# NOTE: if you happen to have bootstrap failures due to missing M4
+# macros, export M4DIRS as a space separated list of directories where
+# aclocal should look in your environment.
+
PYTHONPATH=${PWD:-$(pwd)}/buildtools/autogen${PYTHONPATH:+:$PYTHONPATH}
export PYTHONPATH
+# cope with systems where libtool is not GNU libtool, e.g. Darwin
+type -P glibtoolize > /dev/null \
+ && libtoolize=glibtoolize \
+ || libtoolize=libtoolize
+
+_m4_extra_dirs=
+if [[ -n ${M4DIRS} ]] ; then
+ for d in ${M4DIRS} ; do
+ case ${d} in
+ "-I") d= ;;
+ "-I"*) d=${d#-I} ;;
+ esac
+ [[ -n ${d} ]] && _m4_extra_dirs="${_m4_extra_dirs} -I ${d}"
+ done
+fi
+
python buildtools/autogen/autogen.py &&
(
# replace the line starting with AC_CONFIG_FILES in configure.ag with
@@ -31,8 +51,8 @@
while read f; do [ -x $f.in ] && echo "AC_CONFIG_FILES([$f], [chmod +x $f])";
done < acout.in
sed '1,/^AC_CONFIG_FILES/d' configure.ag
) > configure.ac &&
-libtoolize -c -f &&
-aclocal -I . -I buildtools/conf &&
+$libtoolize -c -f &&
+aclocal -I . -I buildtools/conf ${_m4_extra_dirs} &&
autoheader &&
automake --add-missing --copy --foreign &&
autoconf
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
