* libtoolize.m4sh (func_scan_files): Be sure to set the

default libltdl mode to 'subproject' when libtoolize is
executed before configure.ac has been updated.

diff --git a/ChangeLog b/ChangeLog
index 4c0b07853b0f6ee3c69ae3d1bf91fc062980ddb9..eaae0671571c458f412deecbfa7c3532b27d9052 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-28  Gary V. Vaughan  <gary@gnu.org>
+
+       * libtoolize.m4sh (func_scan_files): Be sure to set the
+       default libltdl mode to 'subproject' when libtoolize is
+       executed before configure.ac has been updated.
+
 2008-01-27  Gary V. Vaughan  <gary@gnu.org>
 
        * libtoolize.m4sh (func_install_pkgconfig_files)

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 0f41c6432fa2b71fccc1d3c623efc2e4c7404774..078cfa2594591d9a4b7c33989d9420cba3d3c85a 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -394,8 +394,11 @@ func_scan_files ()
        test -n "$configure_ac" && my_configure_ac="$configure_ac: "
         func_verbose "${my_configure_ac}not using Autoconf"
 
-       # Make sure ltdldir is set, even though we return early here:
+       # Make sure ltdldir and ltdl_mode have sensible defaults
+        # since we return early here:
        test -n "$ltdldir" || ltdldir=libltdl
+       test -n "$ltdl_mode" || ltdl_mode=subproject
+
        return
     }