[Gnash-commit] /srv/bzr/gnash/trunk r9720: fix the conditionals for libtool, and for libtool 2.x, force the build directory paths to be libbase/libltdl

[rob]

------------------------------------------------------------
revno: 9720
committer: address@hidden
branch nick: trunk
timestamp: Wed 2008-09-10 22:17:20 -0600
message:
  fix the conditionals for libtool, and for libtool 2.x, force the build 
directory paths to be libbase/libltdl
modified:
  Makefile.am
  configure.ac

=== modified file 'Makefile.am'
--- a/Makefile.am       2008-09-08 02:25:36 +0000
+++ b/Makefile.am       2008-09-11 04:17:20 +0000
@@ -59,12 +59,7 @@
 CYGNAL_DIR = cygnal
 endif
 
-# # libtool requires we build in that directory
-# if LIBLTDL2
-# LTDL2_DIR = libltdl
-# endif
-
-SUBDIRS = $(STD_DIRS) $(CYGNAL_DIR) $(LTDL2_DIR)
+SUBDIRS = $(STD_DIRS) $(CYGNAL_DIR)
 
 if TESTSUITE
 SUBDIRS += testsuite

=== modified file 'configure.ac'
--- a/configure.ac      2008-09-11 01:37:33 +0000
+++ b/configure.ac      2008-09-11 04:17:20 +0000
@@ -870,12 +870,14 @@
 AC_LIBTOOL_WIN32_DLL
 else
 LT_INIT([dlopen win32-dll])
-LTDL_INIT([nonrecursive])
+LTDL_INSTALLABLE
+lt_ltdl_dir=libbase/libltdl
+LTDL_INIT([installable nonrecursive])
 fi
 AC_PROG_LIBTOOL
 AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
-AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" = xyes)
-AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" = xyes)
+AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install}" = xyes)
+AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience}" = xyes)
 
 AC_C_CONST
 AC_C_INLINE