[Gnash-commit] /srv/bzr/gnash/trunk r11841: always create libltdl/Makefile, even if we don't plan to use it. This keeps libtool 1.5 on Debian Lenny from choking on make distdir.

[Rob Savoye]

------------------------------------------------------------
revno: 11841
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-29 10:52:40 -0700
message:
  always create libltdl/Makefile, even if we don't plan to use it. This keeps 
libtool 1.5 on Debian Lenny from choking on make distdir.
modified:
  Makefile.am
  configure.ac

=== modified file 'Makefile.am'
--- a/Makefile.am       2010-01-29 04:27:07 +0000
+++ b/Makefile.am       2010-01-29 17:52:40 +0000
@@ -64,6 +64,7 @@
 CYGNAL_DIR = cygnal
 endif
 
+DIST_SUBDIRS = $(STD_DIRS) cygnal extensions testsuite libltdl
 SUBDIRS = $(LIBLTDLDIR) $(STD_DIRS) $(CYGNAL_DIR)
 
 if TESTSUITE
@@ -76,8 +77,6 @@
 
 # man_MANS = doc/gnash.1 doc/gprocessor.1 doc/dumpshm.1 soldumper.1
 
-DIST_SUBDIRS = $(STD_DIRS) cygnal extensions testsuite libltdl
-
 EXTRA_DIST =  \
        autogen.sh \
        config.rpath \

=== modified file 'configure.ac'
--- a/configure.ac      2010-01-29 10:53:16 +0000
+++ b/configure.ac      2010-01-29 17:52:40 +0000
@@ -921,16 +921,8 @@
   fi
   AC_DISABLE_STATIC
 else
-dnl if test x$build_aqua = xyes; then
-       dnl the Aqua-binary is always static.
-dnl    AC_ENABLE_STATIC
-dnl    AC_DISABLE_SHARED
-dnl else
-dnl    AC_DISABLE_STATIC
-dnl fi 
   LT_INIT([dlopen win32-dll disable-static])
   LTDL_INIT([convenience recursive])
-  AC_CONFIG_FILES([libltdl/Makefile])
 fi
 AC_PROG_LIBTOOL
 
@@ -2386,6 +2378,7 @@
 
 AC_OUTPUT(Makefile
 po/Makefile
+libltdl/Makefile
 libmedia/Makefile
 libsound/Makefile
 libbase/Makefile