[Gnash-commit] /srv/bzr/gnash/trunk r9773: Note to self: KISS; Darwin's liboolize

[Markus Gothe]

------------------------------------------------------------
revno: 9773
committer: Markus Gothe <address@hidden>
branch nick: gnash
timestamp: Thu 2008-09-18 02:27:33 +0200
message:
  Note to self: KISS; Darwin's liboolize
modified:
  autogen.sh
  configure.ac

=== modified file 'autogen.sh'
--- a/autogen.sh        2008-09-18 00:05:42 +0000
+++ b/autogen.sh        2008-09-18 00:27:33 +0000
@@ -27,9 +27,7 @@
 #ACLOCAL_FLAGS="-I macros $ACLOCAL_FLAGS"
 
 if test "`uname`" = "Darwin"; then
-darwin=1
-else
-darwin=0
+LIBTOOLIZE=glibtoolize
 fi
 
 (test -f $srcdir/configure.ac) || {
@@ -128,11 +126,7 @@
 # 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"
@@ -141,10 +135,7 @@
     libtoolflags="${libtoolflags} ${ltbasedir} --quiet --recursive"
   fi
   echo "Running libtoolize $ltdlver ${libtoolflags} ..."
-  if test $darwin -eq 1; then
-  LIBTOOLIZE=glibtoolize
-  fi
-    if ${LIBTOOLIZE:-libtoolize} ${libtoolflags}; then
+  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.

=== modified file 'configure.ac'
--- a/configure.ac      2008-09-17 23:37:11 +0000
+++ b/configure.ac      2008-09-18 00:27:33 +0000
@@ -862,10 +862,9 @@
 
 AC_MSG_CHECKING([For the version of libtool])
 if test -n $darwin; then
-ltver=`${LIBTOOLIZE:-glibtoolize} --version | head -1 | cut -d ' ' -f 4`
-else
+LIBTOOLIZE=glibtoolize
+fi
 ltver=`${LIBTOOLIZE:-libtoolize} --version | head -1 | cut -d ' ' -f 4`
-fi
 ltmajor=`echo $ltver | cut -d '.' -f 1`
 AC_MSG_RESULT([$ltver])
 if test $ltmajor -eq 1; then