From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 26 Oct 2005 14:21:01 +0000 (+0000)
Subject: * libtoolize.m4sh: Put back the func_serial_update callback for
X-Git-Tag: release-2-1b~448
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59dc86631d5e3ab0ef92a55baa05ce4d382324dc;p=thirdparty%2Flibtool.git

* libtoolize.m4sh: Put back the func_serial_update callback for
func_copy_some_files so that the testsuite passes again.  We'll
have to find a better way of handling serial numbers in libtool
macro files.
---

diff --git a/ChangeLog b/ChangeLog
index 968276c69..9546f0aa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-10-26  Gary V. Vaughan  <gary@gnu.org>
 
+	* libtoolize.m4sh: Put back the func_serial_update callback for
+	func_copy_some_files so that the testsuite passes again.  We'll
+	have to find a better way of handling serial numbers in libtool
+	macro files.
+
 	* libltdl/Makefile.inc: New file, factored out of Makefile.am for
 	use in non-recursive libltdl installations.
 	* bootstrap: Adjust.
@@ -20,8 +25,6 @@
 	LT_CONFIG_LTDL_DIR, ensure they are the same.
 	* NEWS: Updated.
 
-2005-10-26  Gary V. Vaughan  <gary@gnu.org>
-
 	* libtoolize.m4sh: Don't use func_serial_update as a copy
 	function for libtool m4 files with no macro_regex.  If the
 	files are copied directly into aclocal.m4, because
@@ -32,22 +35,16 @@
 	into aclocal.m4 (and hence updated automatically by the cat of
 	copying a new version to the dest directory).
 
-2005-10-26  Gary V. Vaughan  <gary@gnu.org>
-
 	* libtoolize.m4sh: Move the consistency checks...
 	(func_check_macros): ...into here.  Also suggest LT_WITH_LTDL if
 	appropriate.
 
-2005-10-26  Gary V. Vaughan  <gary@gnu.org>
-
 	* libtoolize.m4sh: Copying just libtool.m4 for hand maintained
 	aclocal.m4 doesn't work.  List all required files in that case,
 	using the files from installed libltdl if available.  Also, list
 	the additional files required when using libltdl.
 	Reported by Patrick Welche <prlw1@newn.cam.ac.uk>.
 
-2005-10-26  Gary V. Vaughan  <gary@gnu.org>
-
 	* libltdl/ltdl.h, libltdl/ltdl.c (lt_dlhandle_first): Removed.
 	* libltdl/ltdl.h, libltdl/ltdl.c (lt_dlhandle_next)
 	(lt_dlhandle_find, lt_dlforeach): Removed...
@@ -57,8 +54,6 @@
 	* doc/libtool.texi: Updated.
 	* NEWS: Updated.
 
-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.
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index d7085deb0..d8405ee45 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1101,7 +1101,8 @@ func_nonemptydir_p ()
       func_verbose "Not copying \`$m4dir/ltdl.m4', libltdl not used."
     fi
 
-    func_copy_some_files "$pkgmacro_files" "$aclocaldir" "$m4dir"
+    func_copy_some_files "$pkgmacro_files" "$aclocaldir" \
+      "$m4dir" func_serial_update
   fi
 
   $opt_quiet || func_check_macros