-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Patch against HEAD -- actually against my dev branch which already has
- --patch-11 applied, so this patch may not apply cleanly directly to
HEAD (sans --patch-11).
Okay to commit and backport to branch-2-0?
Fix problems with serial comparison sed scripts, and factor out
common code from similar serial comparison functions:
* libtoolize.m4sh (func_keyword_update): Common code factored out
of func_ltmain_update and func_config_update.
(func_ltmain_update, func_config_update): Adjust, and fix sed
expressions to not use unportable ? modifier.
(func_install_update): New serial number based file updater keyed
of 'scriptversion' variable in install-sh. Adjust all callers.
- --
Gary V. Vaughan ())_. [EMAIL PROTECTED],gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/[EMAIL PROTECTED]/cvs-utils--tla--1.0
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.4 (Darwin)
iD8DBQFCSa2OFRMICSmD1gYRAqS/AJwOomUquE/I8QpUkNELOLqCyWtnhQCaAm3m
s8h62yzVEVsqG3L+asfCqOE=
=uLJr
-END PGP SIGNATURE-
* looking for [EMAIL PROTECTED]/libtool--gary--1.0--patch-11 to compare with
* comparing to [EMAIL PROTECTED]/libtool--gary--1.0--patch-11
M libtoolize.m4sh
M ChangeLog
* modified files
Index: Changelog
from Gary V. Vaughan [EMAIL PROTECTED]
Fix problems with serial comparison sed scripts, and factor out
common code from similar serial comparison functions:
* libtoolize.m4sh (func_keyword_update): Common code factored out
of func_ltmain_update and func_config_update.
(func_ltmain_update, func_config_update): Adjust, and fix sed
expressions to not use unportable ? modifier.
(func_install_update): New serial number based file updater keyed
of 'scriptversion' variable in install-sh. Adjust all callers.
--- orig/libtoolize.m4sh
+++ mod/libtoolize.m4sh
@@ -678,24 +678,23 @@
}
-# func_ltmain_update filename srcdir destdir
+# func_keyword_update filename srcdir destdir sed_script
# Copy the FILENAME from a SRCDIR to DESTDIR provided that either FILENAME
-# has a newer revision, or DESTFILE does not yet exist, or the user
-# specified `--force' at the command line.
-func_ltmain_update ()
+# has a newer revision according to the serial number extracted by
+# SED_SCRIPT, or DESTFILE does not yet exist, or the user specified
+# `--force' at the command line.
+func_keyword_update ()
{
$opt_debug
my_filename=$1
my_srcdir=$2
my_destdir=$3
+my_sed_script=$4
my_srcfile=$my_srcdir/$my_filename
my_destfile=$my_destdir/$my_filename
-my_update_p=:
-my_sed_ltmain=['/^package_revision=[0-9][1-9.]*/ {
- s,^package_revision=\([0-9.]*\)[ ]*$,\1,; p;
-}; d']
+my_keyword_update_p=:
test -f $my_srcfile || {
func_error \`$my_srcfile' does not exist.
@@ -703,21 +702,21 @@
}
if test -f $my_destfile; then
- my_src_serial=`$SED -e $my_sed_ltmain $my_srcfile`
+ my_src_serial=`$SED -e $my_sed_script $my_srcfile`
test -z $my_src_serial {
func_error warning: no serial number in \`$my_srcfile', not copying.
return
}
- my_dest_serial=`$SED -e $my_sed_ltmain $my_destfile`
+ my_dest_serial=`$SED -e $my_sed_script $my_destfile`
test -n $my_dest_serial || my_dest_serial=0
func_serial_update_check \
$my_srcfile $my_src_serial $my_destfile $my_dest_serial
- my_update_p=$func_serial_update_check_result
+ my_keyword_update_p=$func_serial_update_check_result
fi
-if $my_update_p || $opt_force; then
+if $my_keyword_update_p || $opt_force; then
func_copy $my_srcfile $my_destfile
elif test X$my_dest_serial = X$my_src_serial; then
$opt_quiet \
@@ -726,6 +725,23 @@
}
+# func_ltmain_update filename srcdir destdir
+# Copy the FILENAME from a SRCDIR to DESTDIR provided that either FILENAME
+# has a newer revision, or DESTFILE does not yet exist, or the user
+# specified `--force' at the command line.
+func_ltmain_update ()
+{
+$opt_debug
+my_sed_ltmain=['/^package_revision='\''*[0-9][1-9.]*'\''*/ {
+ s,^package_revision='\''*\([0-9.]*\)'\''*[ ]*$,\1,; p;
+}; d']
+
+func_keyword_update $1 $2 $3 $my_sed_ltmain
+
+return $my_return_status
+}
+
+
# func_config_update filename srcdir destdir
# Copy the FILENAME from a SRCDIR to DESTDIR provided that either FILENAME
# has a newer timestamp, or DESTFILE does not yet exist, or the user
@@ -733,44 +749,30 @@
func_config_update ()
{
$opt_debug
-my_filename=$1
-my_srcdir=$2
-my_destdir=$3
-
-my_srcfile=$my_srcdir/$my_filename
-my_destfile=$my_destdir/$my_filename
