FYI: 306-gary-treat-argz-m4-like-ltdl-m4

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.

  Index: 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: libtoolize.m4sh
  ===================================================================
  RCS file: /sources/libtool/libtool/libtoolize.m4sh,v
  retrieving revision 1.60
  diff -u -u -r1.60 libtoolize.m4sh
  --- libtoolize.m4sh 9 Mar 2007 15:08:43 -0000 1.60
  +++ libtoolize.m4sh 19 Mar 2007 13:21:00 -0000
  @@ -1114,13 +1114,20 @@
       func_verbose "AC_CONFIG_AUX_DIR not defined, not copying libtool 
auxiliary files."
     fi
   
  -  # libtool.m4 and ltdl.m4 were handled specially above
  -  func_massage_aclocal_DATA 'libtool.m4|ltdl.m4'
  +  # argz.m4, libtool.m4 and ltdl.m4 were handled specially above
  +  func_massage_aclocal_DATA 'argz.m4|libtool.m4|ltdl.m4'
   
  -  # 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'
   
  @@ -1159,7 +1166,7 @@
       # Unless we share CONFIG_MACRO_DIR with our parent project,
       # copy macros here.
       if test "${ltdlprefix}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" "${ltdlprefix}m4"
       fi
   
  Index: tests/libtoolize.at
  ===================================================================
  RCS file: /sources/libtool/libtool/tests/libtoolize.at,v
  retrieving revision 1.10
  diff -u -u -r1.10 libtoolize.at
  --- tests/libtoolize.at 26 Feb 2007 07:44:23 -0000 1.10
  +++ tests/libtoolize.at 19 Mar 2007 13:21:00 -0000
  @@ -79,7 +79,6 @@
   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'
  @@ -109,7 +108,6 @@
   [[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'
   libtoolize: copying file `m4/lt~obsolete.m4'
  @@ -131,7 +129,6 @@
   [[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.
   libtoolize: `m4/lt~obsolete.m4' is already up to date.
  @@ -154,7 +151,6 @@
   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'
  @@ -173,7 +169,6 @@
   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.
  @@ -207,7 +202,6 @@
   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'
   libtoolize: copying file `m4/lt~obsolete.m4'
  @@ -232,7 +226,6 @@
   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.
   libtoolize: `m4/lt~obsolete.m4' is already up to date.
  @@ -258,7 +251,6 @@
   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'
  @@ -280,7 +272,6 @@
   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.
  @@ -309,9 +300,9 @@
   
   AT_DATA(expout,
   [[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'
  @@ -421,8 +412,6 @@
   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'.
  @@ -459,8 +448,6 @@
   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.
   libtoolize: `m4/lt~obsolete.m4' is already up to date.
  @@ -482,8 +469,6 @@
   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'
- -- 
  ())_.              Email me: address@hidden
  ( '/           Read my blog: http://blog.azazil.net
  / )=         ...and my book: http://sources.redhat.com/autobook
`(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912 
_________________________________________________________
This patch notification generated by vcsapply version 1.0
http://savannah.gnu.org/projects/cvs-utils
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (Darwin)

iD8DBQFF/o64FRMICSmD1gYRAmQ2AJ9eYAQhcIWMul5Ko7aNj5XrDUl95ACdFymV
khCmsssU31Vn1i12aC8k9Dw=
=1FGg
-----END PGP SIGNATURE-----