summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2008-06-15 18:39:23 +0000
committerNoah Slater <nslater@apache.org>2008-06-15 18:39:23 +0000
commit15b8d236ca889082b2f272bde3190511ce790be8 (patch)
treee698a3bb3fa2cca881a348d55b56936ce9b9bab6
parent86c73ef1f7a0de7c7271a521af7cdc79345ec4fd (diff)
added check for gm4
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@667989 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xbootstrap10
1 files changed, 9 insertions, 1 deletions
diff --git a/bootstrap b/bootstrap
index eebc0b86..02699ad9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -35,6 +35,8 @@ AUTOCONF_EXECUTABLE=`which autoconf || true`
AUTOHEADER_EXECUTABLE=`which autoheader || true`
AUTOMAKE_EXECUTABLE=`which automake || true`
GLIBTOOLIZE_EXECUTABLE=`which glibtoolize || true`
+M4_EXECUTABLE=`which m4 || true`
+GM4_EXECUTABLE=`which gm4 || true`
LIBTOOLIZE_EXECUTABLE=`which libtoolize || true`
SVN_EXECUTABLE=`which svn || true`
@@ -48,7 +50,13 @@ extract_configuration_variable () {
echo "changequote(\`[', \`]')" > $temporary_file
sed "s/m4_//" < $ACINCLUDE_IN_FILE >> $temporary_file
echo $variable_name >> $temporary_file
- m4 $temporary_file | grep -v "^$"
+ if -n "$M4_EXECUTABLE"; then
+ $M4_EXECUTABLE $temporary_file | grep -v "^$"
+ else
+ if -n "$GM4_EXECUTABLE"; then
+ $GM4_EXECUTABLE $temporary_file | grep -v "^$"
+ fi
+ fi
rm -f $temporary_file
}