[Openocd-svn] r1779 - trunk

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-13 23:55:16 +0200 (Wed, 13 May 2009)
New Revision: 1779

Modified:
   trunk/bootstrap
Log:
Fix bootstrap script to support MacOS glibtoolize oddity.

Modified: trunk/bootstrap
===================================================================
--- trunk/bootstrap	2009-05-13 19:13:32 UTC (rev 1778)
+++ trunk/bootstrap	2009-05-13 21:55:16 UTC (rev 1779)
@@ -1,9 +1,25 @@
-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
 echo "Bootstrap complete; you can './configure --enable-maintainer-mode ....'"