[svn-r26270] On OS X, the autogen.sh script will first try to use glibtoolize

and then fall back to libtoolize if not found.

Tested on OS X 10.10.2 (Yosemite) with Xcode 6.1.1 and autotools 
installed via Brew

1 files changed, 6 insertions, 1 deletions

diff --git a/autogen.sh b/autogen.sh
index 3f9d310..82d6552 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -284,8 +284,13 @@ PATH=${AUTOCONF_DIR}:${LIBTOOL_DIR}:${M4_DIR}:${FLEX_DIR}:${BISON_DIR}:$PATH
 # Make libtoolize match the specified libtool
 case "`uname`" in
 Darwin*)
-    # libtoolize on OS-X is non-gnu
+    # On OS X, libtoolize could be named glibtoolize or
+    # libtoolize. Try the former first, then fall back
+    # to the latter if it's not found.
     HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/glibtoolize"
+    if [ ! -f $HDF5_LIBTOOLIZE ] ; then
+        HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/libtoolize"
+    fi
     ;;
 *)
     HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/libtoolize"