From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 26 Oct 2005 09:20:45 +0000 (+0000)
Subject: * libtoolize.m4sh: Always copy pkgconfig_files for --ltdl, incase
X-Git-Tag: release-2-1b~454
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41ffa5624bd54469fa6ec173c6cb0b1c985d941e;p=thirdparty%2Flibtool.git

* libtoolize.m4sh: Always copy pkgconfig_files for --ltdl, incase
ltdl needs additional things not found by automake when looking at
the parent project configury.
* tests/libtoolize.at: Adjust.
---

diff --git a/ChangeLog b/ChangeLog
index bc41213ce..034d79fce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-26  Gary V. Vaughan  <gary@gnu.org>
+
+	* libtoolize.m4sh: Always copy pkgconfig_files for --ltdl, incase
+	ltdl needs additional things not found by automake when looking at
+	the parent project configury.
+	* tests/libtoolize.at: Adjust.
+
 2005-10-17  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/config/ltmain.m4sh [darwin]: Don't check for "bundle"
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 037dbfc08..ae340be68 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -956,26 +956,26 @@ func_nonemptydir_p ()
         "$aclocaldir" "$ltdldir/m4"
     fi
 
-    # Unless we share CONFIG_AUX_DIR with our parent project,
-    # copy config aux files into libltdl.
-    if test "$ltdldir/config" != "$auxdir"; then
-      func_copy_some_files "$pkgconfig_files" "$pkgdatadir" "$ltdldir"
-    fi
+    # Copy config aux files into libltdl.
+    func_copy_some_files "$pkgconfig_files" "$pkgdatadir" "$ltdldir"
   fi
 
-  # If they are newer, copy all the installed utility files to the
+  # Unless we share CONFIG_AUX_DIR with the libltdl subproject, then
+  # if they are newer, copy all the installed utility files to the
   # auxiliary directory if `--install' was passed, or else copy just
   # ltmain.sh.
   if test -n "$auxdir"; then
-    $opt_quiet || if test "$auxdir" != .; then
-      func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
-    fi
-    if $opt_install; then
-      func_config_update config.guess "$pkgdatadir/config" "$auxdir"
-      func_config_update config.sub   "$pkgdatadir/config" "$auxdir"
-      func_install_update install-sh  "$pkgdatadir/config" "$auxdir"
+    if test "$ltdldir/config" != "$auxdir"; then
+      $opt_quiet || if test "$auxdir" != .; then
+        func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
+      fi
+      if $opt_install; then
+        func_config_update config.guess "$pkgdatadir/config" "$auxdir"
+        func_config_update config.sub   "$pkgdatadir/config" "$auxdir"
+        func_install_update install-sh  "$pkgdatadir/config" "$auxdir"
+      fi
+      func_ltmain_update ltmain.sh "$pkgdatadir/config" "$auxdir"
     fi
-    func_ltmain_update ltmain.sh "$pkgdatadir/config" "$auxdir"
   else
     func_verbose "AC_CONFIG_AUX_DIR not defined, not copying libtool auxilliary files."
   fi
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index b1d86378f..9969c1256 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -331,7 +331,12 @@ libtoolize: linking file `ltdl/lt_error.c'
 libtoolize: linking file `ltdl/ltdl.c'
 libtoolize: linking file `ltdl/ltdl.h'
 libtoolize: linking file `ltdl/slist.c'
-libtoolize: putting files in AC_CONFIG_AUX_DIR, `ltdl/config'.
+libtoolize: linking file `ltdl/config/compile'
+libtoolize: linking file `ltdl/config/config.guess'
+libtoolize: linking file `ltdl/config/config.sub'
+libtoolize: linking file `ltdl/config/depcomp'
+libtoolize: linking file `ltdl/config/install-sh'
+libtoolize: linking file `ltdl/config/missing'
 libtoolize: linking file `ltdl/config/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `ltdl/m4'.
 libtoolize: linking file `ltdl/m4/libtool.m4'