[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch 3/3] 306-gary-treat-argz-m4-like-ltdl-m4.diff
From: |
Gary V. Vaughan |
Subject: |
[patch 3/3] 306-gary-treat-argz-m4-like-ltdl-m4.diff |
Date: |
Tue, 01 Nov 2005 12:02:17 +0000 |
User-agent: |
quilt/0.42-1 |
Redone against HEAD, and split into 3 for ease of review :-)
Okay to commit?
Ralf, I know you have reservations about this one, but I don't really
understand them. Can you explain what it is you worry will go wrong
if this is applied? Regardless of whether we apply this patch, I
think it is important that we treat ltdl.m4 and argz.m4 the same, as
they both apply in the same circumstances... ltdl.m4 requires argz.m4,
and is useless without it; libtool.m4 doesn't use ltdl.m4 or argz.m4
so it makes sense not to copy either of them if they are not used by
the calling project (libtoolize is not called with --ltdl)...
Cheers,
Gary.
libtoolize.m4sh | 15 +++++++++++----
tests/libtoolize.at | 17 +----------------
2 files changed, 12 insertions(+), 20 deletions(-)
Index: libtool--devo--1.0/ChangeLog
from Gary V. Vaughan <address@hidden>
* libtoolize.m4sh: Handle argz.m4 specially like ltdl.m4, so
that it isn't copied unless libltdl is being used. Copy other
macro files according to their tagged serial numbers.
* tests/libtoolize.at: Adjust.
Index: libtool--devo--1.0/libtoolize.m4sh
===================================================================
--- libtool--devo--1.0.orig/libtoolize.m4sh
+++ libtool--devo--1.0/libtoolize.m4sh
@@ -1049,8 +1049,8 @@ func_nonemptydir_p ()
func_massage_pkgltdl_files "$glob_exclude_pkgltdl_files"
func_massage_pkgconfig_files
- # libtool.m4 and ltdl.m4 are handled specially below
- func_massage_aclocal_DATA 'libtool.m4|ltdl.m4'
+ # argz.m4, libtool.m4 and ltdl.m4 are handled specially below
+ func_massage_aclocal_DATA 'argz.m4|libtool.m4|ltdl.m4'
glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'
@@ -1069,7 +1069,7 @@ func_nonemptydir_p ()
# Unless we share CONFIG_MACRO_DIR with our parent project,
# copy macros here.
if test "$ltdldir/m4" != "$m4dir"; then
- func_copy_some_files "$pkgmacro_files:libtool.m4:ltdl.m4" \
+ func_copy_some_files "argz.m4:libtool.m4:ltdl.m4:$pkgmacro_files" \
"$aclocaldir" "$ltdldir/m4"
fi
@@ -1097,10 +1097,17 @@ func_nonemptydir_p ()
func_verbose "AC_CONFIG_AUX_DIR not defined, not copying libtool
auxilliary files."
fi
- # Copy libtool's m4 macros to the macro directory, if they are newer.
+ # Copy libtool's m4 macros to the macro directory, if they are newer
+ # (keep these in alphabetical order to maintain sanity in testsuite):
if test -n "$m4dir"; then
$opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
+ if $seen_ltdl; then
+ func_serial_update argz.m4 "$aclocaldir" "$m4dir" argz.m4
+ else
+ func_verbose "Not copying \`$m4dir/argz.m4', libltdl not used."
+ fi
+
func_serial_update libtool.m4 "$aclocaldir" "$m4dir" \
LT_INIT 'A[[CM]]_PROG_LIBTOOL'
Index: libtool--devo--1.0/tests/libtoolize.at
===================================================================
--- libtool--devo--1.0.orig/tests/libtoolize.at
+++ libtool--devo--1.0/tests/libtoolize.at
@@ -77,7 +77,6 @@ AT_DATA(expout,
libtoolize: copying file `config/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
@@ -106,7 +105,6 @@ AT_DATA(expout,
[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
]])
@@ -127,7 +125,6 @@ AT_DATA(expout,
[[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: `m4/libtool.m4' is already up to date.
-libtoolize: `m4/argz.m4' is already up to date.
libtoolize: `m4/ltsugar.m4' is already up to date.
libtoolize: `m4/ltversion.m4' is already up to date.
]])
@@ -149,7 +146,6 @@ AT_DATA(expout,
libtoolize: copying file `config/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
@@ -167,7 +163,6 @@ AT_DATA(expout,
libtoolize: `config/ltmain.sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: `m4/libtool.m4' is already up to date.
-libtoolize: `m4/argz.m4' is already up to date.
libtoolize: `m4/ltoptions.m4' is already up to date.
libtoolize: `m4/ltsugar.m4' is already up to date.
libtoolize: `m4/ltversion.m4' is already up to date.
@@ -200,7 +195,6 @@ libtoolize: copying file `config/config.
libtoolize: copying file `config/install-sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
]])
@@ -224,7 +218,6 @@ libtoolize: `config/config.sub' is alrea
libtoolize: `config/install-sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: `m4/libtool.m4' is already up to date.
-libtoolize: `m4/argz.m4' is already up to date.
libtoolize: `m4/ltsugar.m4' is already up to date.
libtoolize: `m4/ltversion.m4' is already up to date.
]])
@@ -249,7 +242,6 @@ libtoolize: copying file `config/install
libtoolize: copying file `config/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
@@ -270,7 +262,6 @@ libtoolize: `config/install-sh' is alrea
libtoolize: `config/ltmain.sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: `m4/libtool.m4' is already up to date.
-libtoolize: `m4/argz.m4' is already up to date.
libtoolize: `m4/ltoptions.m4' is already up to date.
libtoolize: `m4/ltsugar.m4' is already up to date.
libtoolize: `m4/ltversion.m4' is already up to date.
@@ -339,9 +330,9 @@ libtoolize: linking file `ltdl/config/in
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/argz.m4'
libtoolize: linking file `ltdl/m4/libtool.m4'
libtoolize: linking file `ltdl/m4/ltdl.m4'
-libtoolize: linking file `ltdl/m4/argz.m4'
libtoolize: linking file `ltdl/m4/ltoptions.m4'
libtoolize: linking file `ltdl/m4/ltsugar.m4'
libtoolize: linking file `ltdl/m4/ltversion.m4'
@@ -408,8 +399,6 @@ AT_DATA([expout],
libtoolize: `config/ltmain.sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
-libtoolize: You should add the contents of `m4/argz.m4' to `aclocal.m4'.
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: You should add the contents of `m4/ltsugar.m4' to `aclocal.m4'.
@@ -442,8 +431,6 @@ AT_DATA([expout],
libtoolize: `config/ltmain.sh' is already up to date.
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
-libtoolize: `m4/argz.m4' is already up to date.
-libtoolize: You should add the contents of `m4/argz.m4' to `aclocal.m4'.
libtoolize: `m4/ltsugar.m4' is already up to date.
libtoolize: `m4/ltversion.m4' is already up to date.
]])
@@ -463,8 +450,6 @@ AT_DATA(expout,
libtoolize: copying file `config/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
-libtoolize: You should add the contents of `m4/argz.m4' to `aclocal.m4'.
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
--
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
- [patch 3/3] 306-gary-treat-argz-m4-like-ltdl-m4.diff,
Gary V. Vaughan <=