-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Conversation on this patch stalled here:
http://lists.gnu.org/archive/html/libtool-patches/2005-11/msg00027.html I still believe that arg.m4 is part of ltdl and not libtool, and needs to be treated as such. I don't mind waiting until post 2.0 before worrying about it some more, but just want to put my patch queue back in public view. Index: ChangeLog from Gary V. Vaughan <[EMAIL PROTECTED]> * tests/nonrecursive.at, tests/recursive.at, tests/standalone.at, tests/subproject.at: New tests to ensure that each of the libltdl installation types are correctly added to a distribution tarball, and can be successfully built from the same. 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 10 Mar 2007 14:35:18 -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 10 Mar 2007 14:35:19 -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' Index: tests/nonrecursive.at =================================================================== RCS file: /sources/libtool/libtool/tests/nonrecursive.at,v retrieving revision 1.8 diff -u -u -r1.8 nonrecursive.at --- tests/nonrecursive.at 26 Oct 2006 20:39:04 -0000 1.8 +++ tests/nonrecursive.at 10 Mar 2007 14:35:19 -0000 @@ -138,5 +138,36 @@ AT_CLEANUP + +## --------------------------------- ## +## Distributing libtoolized project. ## +## --------------------------------- ## + +AT_SETUP([distributing libltdl]) + +test ! -d subdirectory-demo-[]AT_PACKAGE_VERSION || { + find subdirectory-demo-[]AT_PACKAGE_VERSION -type d ! -perm -200 \ + -exec chmod u+w {} ';' && + rm -fr subdirectory-demo-[]AT_PACKAGE_VERSION +} + +_LTDL_SETUP + +LT_AT_LIBTOOLIZE([--copy --ltdl --install --nonrecursive]) +AT_CHECK([if test -f ltdl/configure.ac; then false; fi]) + + +# Support vanilla autoconf-2.59 & automake-1.9.6 +for file in argz.c lt__dirent.c lt__strl.c; do + cp ltdl/$file $file +done + +LT_AT_BOOTSTRAP([ignore], [-I ltdl/m4], [], [--add-missing --copy], + [], [], [all distcheck]) + +AT_XFAIL_IF([test -f subdirectory-demo-]AT_PACKAGE_VERSION[.tar.gz || false]) + +AT_CLEANUP + dnl Be careful not to let the definition leak into other tests m4_popdef([_LTDL_SETUP]) Index: tests/recursive.at =================================================================== RCS file: /sources/libtool/libtool/tests/recursive.at,v retrieving revision 1.5 diff -u -u -r1.5 recursive.at --- tests/recursive.at 26 Oct 2006 20:39:04 -0000 1.5 +++ tests/recursive.at 10 Mar 2007 14:35:19 -0000 @@ -109,5 +109,30 @@ AT_CLEANUP + +## --------------------------------- ## +## Distributing libtoolized project. ## +## --------------------------------- ## + +AT_SETUP([distributing libltdl]) + +test ! -d subdirectory-demo-[]AT_PACKAGE_VERSION || { + find subdirectory-demo-[]AT_PACKAGE_VERSION -type d ! -perm -200 \ + -exec chmod u+w {} ';' && + rm -fr subdirectory-demo-[]AT_PACKAGE_VERSION +} + +_LTDL_SETUP + +LT_AT_LIBTOOLIZE([--copy --ltdl --install --recursive]) +AT_CHECK([if test -f ltdl/configure.ac; then false; fi]) + +LT_AT_BOOTSTRAP([ignore], [-I ltdl/m4], [], [--add-missing --copy], + [], [], [all distcheck]) + +AT_XFAIL_IF([test -f subdirectory-demo-]AT_PACKAGE_VERSION[.tar.gz || false]) + +AT_CLEANUP + dnl Be careful not to let the definition leak into other tests m4_popdef([_LTDL_SETUP]) Index: tests/standalone.at =================================================================== RCS file: /sources/libtool/libtool/tests/standalone.at,v retrieving revision 1.6 diff -u -u -r1.6 standalone.at --- tests/standalone.at 16 Dec 2005 16:15:32 -0000 1.6 +++ tests/standalone.at 10 Mar 2007 14:35:19 -0000 @@ -67,6 +67,27 @@ AT_CLEANUP +## --------------------------------- ## +## Distributing libtoolized project. ## +## --------------------------------- ## + +AT_SETUP([distributing libltdl]) + +test ! -d libltdl-[]AT_PACKAGE_VERSION || { + find libltdl-[]AT_PACKAGE_VERSION -type d ! -perm -200 \ + -exec chmod u+w {} ';' && + rm -fr libltdl-[]AT_PACKAGE_VERSION +} + +LT_AT_LIBTOOLIZE([--copy --ltdl=. --install]) +LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix]) +LT_AT_MAKE([all distcheck]) + +AT_CHECK([test -f libltdl-]AT_PACKAGE_VERSION[.tar.gz]) + +AT_CLEANUP + + ## ----------------------------------------------- ## ## libltdl is usable without Autoconf or Automake. ## ## ----------------------------------------------- ## Index: tests/subproject.at =================================================================== RCS file: /sources/libtool/libtool/tests/subproject.at,v retrieving revision 1.11 diff -u -u -r1.11 subproject.at --- tests/subproject.at 16 Dec 2005 16:15:32 -0000 1.11 +++ tests/subproject.at 10 Mar 2007 14:35:19 -0000 @@ -97,6 +97,28 @@ AT_CLEANUP +## --------------------------------- ## +## Distributing libtoolized project. ## +## --------------------------------- ## + +AT_SETUP([distributing libltdl]) + +test ! -d subproject-demo-[]AT_PACKAGE_VERSION || { + find subproject-demo-[]AT_PACKAGE_VERSION -type d ! -perm -200 \ + -exec chmod u+w {} ';' && + rm -fr subproject-demo-[]AT_PACKAGE_VERSION +} + +_LTDL_SETUP + +LT_AT_BOOTSTRAP([--copy --ltdl --install], [-I sub/ltdl/m4], [ignore], + [--add-missing --copy], [], [], [all distcheck]) + +AT_CHECK([test -f subproject-demo-]AT_PACKAGE_VERSION[.tar.gz]) + +AT_CLEANUP + + ## ----------------------------------------------- ## ## libltdl is usable without Autoconf or Automake. ## ## ----------------------------------------------- ## _________________________________________________________ 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) iD8DBQFF8sMSFRMICSmD1gYRAl0cAJ9Fn3KXJ16Aks3xuFx/bdX2XB4nCwCbBnWz fYvIEcmGeeJCDh13jaU0FbY= =Q5rF -----END PGP SIGNATURE-----
