[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Patch] Re: libtoolize weirdness (after 285-gary)
From: |
Gary V. Vaughan |
Subject: |
[Patch] Re: libtoolize weirdness (after 285-gary) |
Date: |
Mon, 17 Oct 2005 10:09:18 +0100 |
User-agent: |
quilt/0.42-1 |
Okay to commit?
Fixes a dumb bug, where the serial numbers of m4_included files are
looked up incorrectly.
libtoolize.m4sh | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
Index: libtool--devo--1.0/ChangeLog
from Gary V. Vaughan <address@hidden>
* libtoolize.m4sh (func_serial_update): Only make the second
serial number check if the destination file wasn't m4_included
into aclocal.m4 (and hence updated automatically by the cat of
copying a new version to the dest directory).
Index: libtool--devo--1.0/libtoolize.m4sh
===================================================================
--- libtool--devo--1.0.orig/libtoolize.m4sh
+++ libtool--devo--1.0/libtoolize.m4sh
@@ -677,13 +677,18 @@ func_serial_update ()
# Do this after the copy for hand maintained `aclocal.m4', incase
# it has `m4_include([DESTFILE])', so the copy effectively already
# updated `aclocal.m4'.
- if test -f aclocal.m4; then
- func_serial_max \
- "$my_src_serial" `func_serial aclocal.m4 "$my_macro_regex"`
- test "X$my_src_serial" = "X$func_serial_max_result" \
- && func_echo "You should add the contents of \`$my_destfile' to
\`aclocal.m4'."
- fi
-
+ my_included_files=`func_included_files aclocal.m4`
+ case `echo " "$my_included_files" "` in
+ *" $my_destfile "*) ;;
+ *)
+ if test -f aclocal.m4; then
+ func_serial_max \
+ "$my_src_serial" `func_serial aclocal.m4 "$my_macro_regex"`
+ test "X$my_src_serial" = "X$func_serial_max_result" \
+ && func_echo "You should add the contents of \`$my_destfile' to
\`aclocal.m4'."
+ fi
+ ;;
+ esac
return $my_return_status
}
--
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook