From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Wed, 13 May 2009 21:55:16 +0000 (+0000)
Subject: Fix bootstrap script to support MacOS glibtoolize oddity.
X-Git-Tag: v0.2.0~731
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=3df27e5ce5bb4c62839370f67ea3fd78f987e84d

Fix bootstrap script to support MacOS glibtoolize oddity.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1779 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---

diff --git a/bootstrap b/bootstrap
index b49fda3244..2e7b5329fb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,24 @@
-aclocal \
-&& autoheader \
-&& libtoolize --automake \
-&& automake --foreign --add-missing --copy \
-&& autoconf
+#!/bin/sh -e
+
+if libtoolize --version >/dev/null 2>&1; then
+	libtoolize="libtoolize"
+elif libtoolize --version >/dev/null 2>&1; then
+	libtoolize="glibtoolize"
+else
+	echo "libtool is required" >&2
+	exit 1
+fi
+
+# bootstrap the autotools
+(
+set -x
+aclocal
+autoheader
+${libtoolize} --automake --copy
+autoconf
+autoheader
+automake --foreign --add-missing --copy
+)
 
 # AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode
 # otherwise the documentation will fail to build due to missing version.texi