couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: Tweaks to bootstrap
Date Sun, 14 Oct 2012 01:07:35 GMT
Updated Branches:
  refs/heads/docs b62a3e9ac -> c172a357c


Tweaks to bootstrap


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c172a357
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c172a357
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c172a357

Branch: refs/heads/docs
Commit: c172a357c8df9203c1263c242723d7d7d76f789b
Parents: b62a3e9
Author: Noah Slater <nslater@apache.org>
Authored: Sun Oct 14 02:07:31 2012 +0100
Committer: Noah Slater <nslater@apache.org>
Committed: Sun Oct 14 02:07:31 2012 +0100

----------------------------------------------------------------------
 bootstrap |   57 ++++++++++---------------------------------------------
 1 files changed, 11 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c172a357/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index 4e9a328..6536aaa 100755
--- a/bootstrap
+++ b/bootstrap
@@ -29,54 +29,20 @@ get () {
     rm -f acinclude.m4.tmp
 }
 
-mkdir -p build-aux
+# mkdir -p build-aux
+mkdir -p m4
 
 if test -z "$REVISION"; then
-    if test -d .git; then
-        REVISION=`git describe --always`-git
-    else
-        # default to svn
-        REVISION=`\`which svn\` info . 2> /dev/null | awk "/Revision:/{print \\$2}"`
-    fi
+	REVISION=`git describe --always`-git
 fi
+
 if test -z "`get LOCAL_VERSION_STAGE`" -o -z "$REVISION"; then
     sed "s/%release%//" < acinclude.m4.in > acinclude.m4
 else
     sed "s/%release%/$REVISION/" < acinclude.m4.in > acinclude.m4
 fi
 
-# Seach a list of names for the first occurence of a program.
-# Some systems may use aclocal-1.10, others may have aclocal etc.
-#
-# Exit with status code 0 if the program exists (and print the
-# path to stdout), exit with status code 1 if it can't be
-# located
-find_program() {
-  set +e
-  for f in "$@"
-  do
-    file=`which ${f} 2>/dev/null | grep -v '^no '`
-    if test -n "x${file}" -a -x "${file}"
-    then
-      echo ${file}
-      set -e
-      exit 0
-    fi
-  done
-
-  echo "Failed to locate required program:" 1>&2
-  echo "\t$@" 1>&2
-  set -e
-  exit 1
-}
-
-LIBTOOLIZE=`find_program glibtoolize libtoolize`
-ACLOCAL=`find_program aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal`
-AUTOHEADER=`find_program autoheader`
-AUTOMAKE=`find_program automake-1.11 automake-1.10 automake-1.9 automake`
-AUTOCONF=`find_program autoconf`
-
-texi_file=share/doc/build/texinfo/CouchDB.texi
+texi_file="share/doc/build/texinfo/CouchDB.texi"
 
 if test ! -e $texi_file; then
 	mkdir -p `dirname $texi_file`
@@ -85,20 +51,19 @@ if test ! -e $texi_file; then
 EOF
 fi
 
-# @@ run autoupdate first, to get new syntax
-
 # @@ then convert this to use autoreconf -i -Wall
 
 # @@ add dep on pkg-config and autoconf-archive
 
-${LIBTOOLIZE} -f -c --automake
-${ACLOCAL} -I m4
-${AUTOHEADER} -f
-${AUTOMAKE} -f -a 2>&1
-${AUTOCONF} -f
+autoreconf -vi -Wall
 
 ln -f -s "`dirname \`readlink build-aux/missing\``/INSTALL"
 
+if test -e INSTALL; then
+	echo "Broken INSTALL file."
+	exit 1
+fi
+
 cat << EOF
 You have bootstrapped Apache CouchDB, time to relax.
 


Mime
View raw message