[Gnash-commit] /srv/bzr/gnash/trunk r9771: Added Darwin's libtoolize support

[Markus Gothe]

------------------------------------------------------------
revno: 9771
committer: Markus Gothe <address@hidden>
branch nick: gnash
timestamp: Thu 2008-09-18 02:03:08 +0200
message:
  Added Darwin's libtoolize support
modified:
  autogen.sh

=== modified file 'autogen.sh'
--- a/autogen.sh        2008-09-11 22:51:32 +0000
+++ b/autogen.sh        2008-09-18 00:03:08 +0000
@@ -26,6 +26,12 @@
 #Always use our macros
 #ACLOCAL_FLAGS="-I macros $ACLOCAL_FLAGS"
 
+if test "`uname`" = "Darwin"; then
+darwin=1
+else
+darwin=0
+fi
+
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level package directory"
@@ -122,7 +128,11 @@
 # used to. For more fun, libtoolize has different command line arguments, but 
one thing
 # that got fixed is for libtool 2.x there is an #define for the config file 
name, but
 # for libtool 1.5 it expects config.h always, so we change this to 
gnashconfig.h.
+if test $darwin -eq 1; then
+ltdlver=`${LIBTOOLIZE:-glibtoolize} --version | head -1 | cut -d ' ' -f 4`
+else
 ltdlver=`${LIBTOOLIZE:-libtoolize} --version | head -1 | cut -d ' ' -f 4`
+fi
 ltdlmajor=`echo $ltdlver | cut -d '.' -f 1`
 if test -z "$NO_LIBTOOLIZE" ; then
   ltbasedir="libltdl"
@@ -131,7 +141,10 @@
     libtoolflags="${libtoolflags} ${ltbasedir} --quiet --recursive"
   fi
   echo "Running libtoolize $ltdlver ${libtoolflags} ..."
-  if ${LIBTOOLIZE:-libtoolize} ${libtoolflags}; then
+  if test $darwin -eq 1; then
+  LIBTOOLIZE=glibtoolize
+  fi
+    if ${LIBTOOLIZE:-libtoolize} ${libtoolflags}; then
     # libtool insists on including config.h, but we use gnashconfig.h
     # to avoid any problems, so we have to change this include
     # so they all reference the right config header file.
@@ -160,7 +173,11 @@
     exit 1
   fi
 fi
-
+if test -z "$NO_LIBTOOLIZE" ; then
+       if test $darwin -eq 1; then
+               (cd libltdl; ./configure)
+       fi
+fi
 #for coin in `find $srcdir -name CVS -prune -o -name configure.ac -print`
 for coin in configure.ac
 do