From: Gary V. Vaughan <gary@gnu.org>
Date: Mon, 28 Jan 2008 05:04:51 +0000 (+0000)
Subject: * libtoolize.m4sh (func_scan_files): Be sure to set the
X-Git-Tag: release-2-1b~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d10890da53aeb9d43be100f9192fc234383cc1a;p=thirdparty%2Flibtool.git

* 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 4c0b07853..eaae06715 100644
--- 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 0f41c6432..078cfa259 100644
--- 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
     }