[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnash-commit
Subject:    [Gnash-commit] /srv/bzr/gnash/trunk r11836: Fix configure for
From:       Benjamin Wolsey <bwy () benjaminwolsey ! de>
Date:       2010-01-29 10:45:07
Message-ID: E1NaoqX-00043G-Ih () internal
[Download RAW message or body]

------------------------------------------------------------
revno: 11836
committer: Benjamin Wolsey <bwy@benjaminwolsey.de>
branch nick: trunk
timestamp: Fri 2010-01-29 11:45:07 +0100
message:
  Fix configure for libtool 1.x on non-windows machines.
  
  Indentation.
modified:
  configure.ac

["r11836.diff" (r11836.diff)]

=== modified file 'configure.ac'
--- a/configure.ac	2010-01-29 05:56:18 +0000
+++ b/configure.ac	2010-01-29 10:45:07 +0000
@@ -902,21 +902,22 @@
 
 AC_MSG_CHECKING([For the version of libtool])
 if test -d ${srcdir}/libltdl/libltdl; then
-ltver=2.x
+  ltver=2.x
 else
-ltver=1.x
+  ltver=1.x
 fi
 ltmajor=`echo $ltver | cut -d '.' -f 1`
 AC_MSG_RESULT([$ltver])
 AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
 AM_CONDITIONAL(LIBLTDL1, [test $ltmajor -eq 1])
 if test $ltmajor -eq 1; then
-	AC_LIBLTDL_CONVENIENCE
-	AC_LIBTOOL_DLOPEN
+  AC_LIBLTDL_CONVENIENCE
+  AC_LIBTOOL_DLOPEN
   if test x"${windows}" = x"yes"; then
-	  AC_LIBTOOL_WIN32_DLL
+    AC_LIBTOOL_WIN32_DLL
+    :
   fi
-	AC_DISABLE_STATIC
+  AC_DISABLE_STATIC
 else
 dnl if test x$build_aqua = xyes; then
 	dnl the Aqua-binary is always static.
@@ -925,8 +926,8 @@
 dnl else
 dnl	AC_DISABLE_STATIC
 dnl fi	
-	LT_INIT([dlopen win32-dll disable-static])
-	LTDL_INIT([convenience recursive])
+  LT_INIT([dlopen win32-dll disable-static])
+  LTDL_INIT([convenience recursive])
   AC_CONFIG_FILES([libltdl/Makefile])
 fi
 AC_PROG_LIBTOOL



_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit


[prev in list] [next in list] [prev in thread] [next in thread]