Updated the bootstrap scripts to use libtoolize if glibtoolize isn't

available on darwin.

the configure.ac files also needed updating from AM_CONFIG_HEADER
to AC_CONFIG_HEADER for compatiblity with the current autotools.

IlmBase/bootstrap

@@ -1,10 +1,12 @@
 #! /bin/sh
 # If we're on OS X, use glibtoolize instead of toolize
 HOSTTYPE=`uname`
+LIBTOOLIZE=libtoolize
 if [ "$HOSTTYPE" == "Darwin" ]; then
-        LIBTOOLIZE=glibtoolize
-else
-	LIBTOOLIZE=libtoolize
+	GLIBTOOLIZE=`which glibtoolize`
+	if [ "x$GLIBTOOLIZE" != "x" ]; then
+		LIBTOOLIZE=glibtoolize
+	fi
 fi
 
 

IlmBase/configure.ac

@@ -4,7 +4,7 @@ AC_SUBST(ILMBASE_VERSION, 2.0.0)
 AC_SUBST(ILMBASE_VERSION_SAFE, 2_0_0)
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(ImathTest/main.cpp)
-AM_CONFIG_HEADER(config/IlmBaseConfig.h)
+AC_CONFIG_HEADER(config/IlmBaseConfig.h)
 AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
 AM_MAINTAINER_MODE
 

OpenEXR/bootstrap

@@ -1,10 +1,12 @@
 #! /bin/sh
 # If we're on OS X, use glibtoolize instead of toolize
 HOSTTYPE=`uname`
+LIBTOOLIZE=libtoolize
 if [ "$HOSTTYPE" == "Darwin" ]; then
-        LIBTOOLIZE=glibtoolize
-else
-	LIBTOOLIZE=libtoolize
+	GLIBTOOLIZE=`which glibtoolize`
+	if [ "x$GLIBTOOLIZE" != "x" ]; then
+		LIBTOOLIZE=glibtoolize
+	fi
 fi
 
 

OpenEXR/configure.ac

@@ -5,7 +5,7 @@ AC_SUBST(OPENEXR_VERSION, 2.0.0)
 AC_SUBST(OPENEXR_VERSION_SAFE, 2_0_0)
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
-AM_CONFIG_HEADER(config/OpenEXRConfig.h)
+AC_CONFIG_HEADER(config/OpenEXRConfig.h)
 AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
 AM_MAINTAINER_MODE
 

PyIlmBase/bootstrap

@@ -1,10 +1,12 @@
 #! /bin/sh
 # If we're on OS X, use glibtoolize instead of toolize
 HOSTTYPE=`uname`
+LIBTOOLIZE=libtoolize
 if [ "$HOSTTYPE" == "Darwin" ]; then
-        LIBTOOLIZE=glibtoolize
-else
-	LIBTOOLIZE=libtoolize
+	GLIBTOOLIZE=`which glibtoolize`
+	if [ "x$GLIBTOOLIZE" != "x" ]; then
+		LIBTOOLIZE=glibtoolize
+	fi
 fi
 
 

PyIlmBase/configure.ac

@@ -3,7 +3,7 @@ AC_INIT(PyIlmBase, 2.0.0)
 AC_SUBST(PYILMBASE_VERSION, 2.0.0)
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(PyIex/iexmodule.cpp)
-AM_CONFIG_HEADER(config/PyIlmBaseConfig.h)
+AC_CONFIG_HEADER(config/PyIlmBaseConfig.h)
 AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
 AM_MAINTAINER_MODE
 dnl static python modules make no sense - disable static