libltdl: move libltdl argz module into LT namespace.

To avoid clashes with gnulib argz module in ltdl client projects,
move ours into its own namespace.
* libltdl/argz_.h, libltdl/argz.c, m4/argz.m4: Move from here...
* libltdl/libltdl/lt__argz_.h, libltdl/lt__argz.c, m4/ltargz.m4:
...to here.
* Makefile.am, libltdl/libltdl/lt__glibc.h, libltdl/ltdl.mk,
libtoolize.in, m4/ltdl.m4: Adjust accordingly.
* tests/libtoolize.at, tests/ltdl-api.at, tests/nonrecursive.at,
tests/old-ltdl-iface.at: Adjust for different libtoolize output.
* libltdl/.gitignore: Adjust accordingly.
* NEWS: Update.
Reported by Pavel Raiskup

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/Makefile.am b/Makefile.am
index a7ae738c22c2322e35eaa88c774d4dda54c62a9c..0d39d66408e33ce87c5f1b3b50cf236ca9756471 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -352,10 +352,10 @@ lt_aclocal_m4_deps = \
        $(lt_obsolete_m4) \
        $(ltversion_m4) \
        $(libtool_m4) \
-       $(srcdir)/$(macro_dir)/ltoptions.m4 \
+       $(srcdir)/$(macro_dir)/ltargz.m4 \
        $(srcdir)/$(macro_dir)/ltdl.m4 \
+       $(srcdir)/$(macro_dir)/ltoptions.m4 \
        $(srcdir)/$(macro_dir)/ltsugar.m4 \
-       $(srcdir)/$(macro_dir)/argz.m4 \
        $(srcdir)/$(ltdl_dir)/configure.ac
 
 lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps)
@@ -435,7 +435,7 @@ pkgaux_data_files   = $(pkgaux_parent_files)
 
 # Everything that gets picked up by aclocal is automatically distributed,
 # this is the list of macro files we install on the user's system.
-pkgmacro_files = argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 \
+pkgmacro_files = libtool.m4 ltargz.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 \
                  ltversion.m4 lt~obsolete.m4
 
 ## These are installed as a subdirectory of pkgdatadir so that
@@ -446,11 +446,10 @@ pkgltdl_files     = COPYING.LIB \
                  README \
                  configure.ac \
                  aclocal.m4 \
-                 argz_.h \
-                 argz.c \
                  config-h.in \
                  configure \
                  libltdl/lt__alloc.h \
+                 libltdl/lt__argz_.h \
                  libltdl/lt__dirent.h \
                  libltdl/lt__glibc.h \
                  libltdl/lt__private.h \
@@ -467,6 +466,7 @@ pkgltdl_files       = COPYING.LIB \
                  loaders/preopen.c \
                  loaders/shl_load.c \
                  lt__alloc.c \
+                 lt__argz.c \
                  lt__dirent.c \
                  lt__strl.c \
                  lt_dlloader.c \

diff --git a/NEWS b/NEWS
index a53526ff9128a870caa30a978af0c5292a130693..79f494215e4dcbb6032612d193bf7440e42bb35c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,10 +2,19 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** New features:
+
+  - Libltdl maintains its own fork of argz, with macros and files in
+    the LT_ and lt__ namespaces (resp.) where they cannot clash with
+    client projects' use of gnulib argz.
+
 ** Bug fixes:
 
   - Installation of 'libtoolize' once again obeys '--program-prefix',
     '--program-suffix' and '--program-transform-name' configure options.
+  - `libtoolize` doesn't remove any files that it can't reinstall,
+    including old versions of the snippet directory, and gnulib's
+    version of the argz module and supporting files.
 
 ** Changes in supported systems or compilers:
 

diff --git a/libltdl/.gitignore b/libltdl/.gitignore
index e1355869e8827a8d30c74c7890f843748a12c465..4cc17af52d5765d8e5e1aaa29f9058e14245ec22 100644 (file)
--- a/libltdl/.gitignore
+++ b/libltdl/.gitignore
@@ -1,6 +1,6 @@
 /COPYING.LIB
 /Makefile.am
-/argz.h
+/libltdl/lt__argz.h
 /libgnu
 /dummy.c
 /gnulib.mk

diff --git a/libltdl/argz_.h b/libltdl/libltdl/lt__argz_.h
similarity index 100%
rename from libltdl/argz_.h
rename to libltdl/libltdl/lt__argz_.h

diff --git a/libltdl/libltdl/lt__glibc.h b/libltdl/libltdl/lt__glibc.h
index 8b96c89dafe3f7e5aea68c5e5f4829fc44ff541c..48bc1ffb5b35fc0cb805104e68a9caeaf25762e6 100644 (file)
--- a/libltdl/libltdl/lt__glibc.h
+++ b/libltdl/libltdl/lt__glibc.h
@@ -53,7 +53,10 @@ or obtained by writing to the Free Software Foundation, Inc.,
 #  define argz_next            lt__argz_next
 #  undef  argz_stringify
 #  define argz_stringify       lt__argz_stringify
-#endif
+
+#  include <lt__argz.h>
+
+#else
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,6 +68,8 @@ extern "C" {
 }
 #endif
 
+#endif /*!defined HAVE_ARGZ_H || !defined HAVE_WORKING_ARGZ*/
+
 # define slist_concat  lt__slist_concat
 # define slist_cons    lt__slist_cons
 # define slist_delete  lt__slist_delete

diff --git a/libltdl/argz.c b/libltdl/lt__argz.c
similarity index 98%
rename from libltdl/argz.c
rename to libltdl/lt__argz.c
index 2fcb90c627ba4089dcd6f56b543c445fb40c8f94..de8539dc5e2cfa4d938eb49265c8546035945c0c 100644 (file)
--- a/libltdl/argz.c
+++ b/libltdl/lt__argz.c
@@ -1,4 +1,4 @@
-/* argz.c -- argz implementation for non-glibc systems
+/* lt__argz.c -- argz implementation for non-glibc systems
 
    Copyright (C) 2004, 2006-2008, 2011-2014 Free Software Foundation,
    Inc.
@@ -35,7 +35,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 #  include <config.h>
 #endif
 
-#include <argz.h>
+#include <lt__argz.h>
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk
index 2e9a437a345ce8a52013702774753a2254e1742b..4d32de934a29851f547a9bf00115388cbe305f1e 100644 (file)
--- a/libltdl/ltdl.mk
+++ b/libltdl/ltdl.mk
@@ -34,8 +34,9 @@
 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
 # (not as a sub-package!) using 'nostdinc':
 AM_CPPFLAGS           += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
-                         -DLTDL -I. -I$(srcdir) -Ilibltdl \
-                         -I$(srcdir)/libltdl -I$(srcdir)/libltdl/libltdl
+                         -DLTDL -I. -I$(srcdir) \
+                         -Ilibltdl  -I$(srcdir)/libltdl \
+                         -Ilibltdl/libltdl -I$(srcdir)/libltdl/libltdl
 AM_LDFLAGS            += -no-undefined
 LTDL_VERSION_INFO      = -version-info 10:1:3
 
@@ -133,16 +134,16 @@ EXTRA_DIST               += libltdl/COPYING.LIB \
 ## Gnulib Makefile.am snippets ##
 ## --------------------------- ##
 
-BUILT_SOURCES  += libltdl/$(ARGZ_H)
-EXTRA_DIST     += libltdl/argz_.h \
-                  libltdl/argz.c
+BUILT_SOURCES  += libltdl/libltdl/$(LT_ARGZ_H)
+EXTRA_DIST     += libltdl/libltdl/lt__argz_.h \
+                  libltdl/lt__argz.c
 
 # We need the following in order to create an <argz.h> when the system
 # doesn't have one that works with the given compiler.
-all-local $(lib_OBJECTS): libltdl/$(ARGZ_H)
-libltdl/argz.h: libltdl/argz_.h
-       $(AM_V_at)$(mkinstalldirs) . libltdl/
-       $(AM_V_GEN)cp $(srcdir)/libltdl/argz_.h $@-t
+all-local $(lib_OBJECTS): libltdl/libltdl/$(LT_ARGZ_H)
+libltdl/libltdl/lt__argz.h: libltdl/libltdl/lt__argz_.h
+       $(AM_V_at)$(mkinstalldirs) . libltdl/libltdl
+       $(AM_V_GEN)cp $(srcdir)/libltdl/libltdl/lt__argz_.h $@-t
        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += libltdl/argz.h \
-                   libltdl/argz.h-t
+MOSTLYCLEANFILES += libltdl/libltdl/lt__argz.h \
+                   libltdl/libltdl/lt__argz.h-t

diff --git a/libtoolize.in b/libtoolize.in
index 9fda071df485be3d573cf1d75fb4a0463fecbb81..9d8c86013ed2379dd7658c79bd86d0a06efb3b91 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -1114,7 +1114,7 @@ func_check_macros ()
       my_missing=
       for file in $pkgmacro_files; do
         case $file in
-          argz.m4|ltdl.m4) $opt_ltdl || continue ;;
+          ltargz.m4|ltdl.m4) $opt_ltdl || continue ;;
         esac
         if test -f "aclocal.m4"; then
           func_aclocal_update_check $file
@@ -1898,8 +1898,8 @@ func_require_seen_libtool ()
   # install them without --install, and the project may not be using
   # Automake.  Similarly, do not remove Gnulib files.
   all_pkgaux_files="compile depcomp missing ltmain.sh"
-  all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
-  all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
+  all_pkgmacro_files="libtool.m4 ltargz.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
+  all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__argz.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__argz.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
 
   # Files installed by func_install_*, some files are missing from these
   # lists deliberately because their respective func_install has to handle

diff --git a/m4/argz.m4 b/m4/ltargz.m4
similarity index 88%
rename from m4/argz.m4
rename to m4/ltargz.m4
index f7bd7c00bd2fe8d549aa82d47f424dd6daefb3c2..b840397272ba862074dfa62bf91600453d45eae2 100644 (file)
--- a/m4/argz.m4
+++ b/m4/ltargz.m4
@@ -7,11 +7,9 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 argz.m4
-
-AC_DEFUN([gl_FUNC_ARGZ],
-[gl_PREREQ_ARGZ
+# serial 1 ltargz.m4
 
+AC_DEFUN([LT_FUNC_ARGZ], [
 AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
 
 AC_CHECK_TYPES([error_t],
@@ -24,9 +22,9 @@ AC_CHECK_TYPES([error_t],
 #  include <argz.h>
 #endif])
 
-ARGZ_H=
+LT_ARGZ_H=
 AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \
-       argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])])
+       argz_next argz_stringify], [], [LT_ARGZ_H=lt__argz.h; AC_LIBOBJ([lt__argz])])
 
 dnl if have system argz functions, allow forced use of
 dnl libltdl-supplied implementation (and default to do so
@@ -37,7 +35,7 @@ dnl     provides them, yet they are broken, is cygwin
 dnl     releases prior to 16-Mar-2007 (1.5.24 and earlier)
 dnl So, it's more straightforward simply to special case
 dnl this for known bad systems.
-AS_IF([test -z "$ARGZ_H"],
+AS_IF([test -z "$LT_ARGZ_H"],
     [AC_CACHE_CHECK(
         [if argz actually works],
         [lt_cv_sys_argz_works],
@@ -69,11 +67,8 @@ AS_IF([test -z "$ARGZ_H"],
      AS_IF([test yes = "$lt_cv_sys_argz_works"],
         [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
                    [This value is set to 1 to indicate that the system argz facility works])],
-        [ARGZ_H=argz.h
-        AC_LIBOBJ([argz])])])
+        [LT_ARGZ_H=lt__argz.h
+        AC_LIBOBJ([lt__argz])])])
 
-AC_SUBST([ARGZ_H])
+AC_SUBST([LT_ARGZ_H])
 ])
-
-# Prerequisites of lib/argz.c.
-AC_DEFUN([gl_PREREQ_ARGZ], [:])

diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index 7f30925ce6846c5b4ebe6be9ac5b4beb9bdf74d3..7264d199dda302f753f3683575987f0584c1a4e1 100644 (file)
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -7,7 +7,7 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 19 LTDL_INIT
+# serial 20 LTDL_INIT
 
 # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
 # ------------------------------------------
@@ -373,7 +373,7 @@ AC_REQUIRE([LT_LIB_DLLOAD])dnl
 AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
 AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl
 AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl
-AC_REQUIRE([gl_FUNC_ARGZ])dnl
+AC_REQUIRE([LT_FUNC_ARGZ])dnl
 
 m4_require([_LT_CHECK_OBJDIR])dnl
 m4_require([_LT_HEADER_DLFCN])dnl

diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index 566a2f4e68e410b1ac516551b358f7d8cb81dc42..7758f9d28101d7d6f5f3cd9e512dde5480f85651 100644 (file)
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -384,8 +384,8 @@ libtoolize: copying file 'build-aux/config.sub'
 libtoolize: copying file 'build-aux/install-sh'
 libtoolize: copying file 'build-aux/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
-libtoolize: copying file 'm4/argz.m4'
 libtoolize: copying file 'm4/libtool.m4'
+libtoolize: copying file 'm4/ltargz.m4'
 libtoolize: copying file 'm4/ltdl.m4'
 libtoolize: copying file 'm4/ltoptions.m4'
 libtoolize: copying file 'm4/ltsugar.m4'
@@ -394,9 +394,8 @@ libtoolize: copying file 'm4/lt~obsolete.m4'
 libtoolize: putting libltdl files in 'ltdl'.
 libtoolize: copying file 'ltdl/COPYING.LIB'
 libtoolize: copying file 'ltdl/README'
-libtoolize: copying file 'ltdl/argz_.h'
-libtoolize: copying file 'ltdl/argz.c'
 libtoolize: copying file 'ltdl/libltdl/lt__alloc.h'
+libtoolize: copying file 'ltdl/libltdl/lt__argz_.h'
 libtoolize: copying file 'ltdl/libltdl/lt__dirent.h'
 libtoolize: copying file 'ltdl/libltdl/lt__glibc.h'
 libtoolize: copying file 'ltdl/libltdl/lt__private.h'
@@ -413,6 +412,7 @@ libtoolize: copying file 'ltdl/loaders/loadlibrary.c'
 libtoolize: copying file 'ltdl/loaders/preopen.c'
 libtoolize: copying file 'ltdl/loaders/shl_load.c'
 libtoolize: copying file 'ltdl/lt__alloc.c'
+libtoolize: copying file 'ltdl/lt__argz.c'
 libtoolize: copying file 'ltdl/lt__dirent.c'
 libtoolize: copying file 'ltdl/lt__strl.c'
 libtoolize: copying file 'ltdl/lt_dlloader.c'
@@ -457,8 +457,8 @@ libtoolize: linking file 'build-aux/install-sh'
 libtoolize: linking file 'build-aux/missing'
 libtoolize: linking file 'build-aux/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
-libtoolize: linking file 'm4/argz.m4'
 libtoolize: linking file 'm4/libtool.m4'
+libtoolize: linking file 'm4/ltargz.m4'
 libtoolize: linking file 'm4/ltdl.m4'
 libtoolize: linking file 'm4/ltoptions.m4'
 libtoolize: linking file 'm4/ltsugar.m4'
@@ -471,11 +471,10 @@ libtoolize: linking file 'ltdl/Makefile.in'
 libtoolize: linking file 'ltdl/README'
 libtoolize: linking file 'ltdl/configure.ac'
 libtoolize: copying file 'ltdl/aclocal.m4'
-libtoolize: linking file 'ltdl/argz_.h'
-libtoolize: linking file 'ltdl/argz.c'
 libtoolize: linking file 'ltdl/config-h.in'
 libtoolize: copying file 'ltdl/configure'
 libtoolize: linking file 'ltdl/libltdl/lt__alloc.h'
+libtoolize: linking file 'ltdl/libltdl/lt__argz_.h'
 libtoolize: linking file 'ltdl/libltdl/lt__dirent.h'
 libtoolize: linking file 'ltdl/libltdl/lt__glibc.h'
 libtoolize: linking file 'ltdl/libltdl/lt__private.h'
@@ -492,6 +491,7 @@ libtoolize: linking file 'ltdl/loaders/loadlibrary.c'
 libtoolize: linking file 'ltdl/loaders/preopen.c'
 libtoolize: linking file 'ltdl/loaders/shl_load.c'
 libtoolize: linking file 'ltdl/lt__alloc.c'
+libtoolize: linking file 'ltdl/lt__argz.c'
 libtoolize: linking file 'ltdl/lt__dirent.c'
 libtoolize: linking file 'ltdl/lt__strl.c'
 libtoolize: linking file 'ltdl/lt_dlloader.c'
@@ -556,8 +556,8 @@ libtoolize: copying file 'build-aux/install-sh'
 libtoolize: copying file 'build-aux/missing'
 libtoolize: copying file 'build-aux/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
-libtoolize: copying file 'm4/argz.m4'
 libtoolize: copying file 'm4/libtool.m4'
+libtoolize: copying file 'm4/ltargz.m4'
 libtoolize: copying file 'm4/ltdl.m4'
 libtoolize: copying file 'm4/ltoptions.m4'
 libtoolize: copying file 'm4/ltsugar.m4'
@@ -570,11 +570,10 @@ libtoolize: copying file 'ltdl/Makefile.in'
 libtoolize: copying file 'ltdl/README'
 libtoolize: copying file 'ltdl/configure.ac'
 libtoolize: copying file 'ltdl/aclocal.m4'
-libtoolize: copying file 'ltdl/argz_.h'
-libtoolize: copying file 'ltdl/argz.c'
 libtoolize: copying file 'ltdl/config-h.in'
 libtoolize: copying file 'ltdl/configure'
 libtoolize: copying file 'ltdl/libltdl/lt__alloc.h'
+libtoolize: copying file 'ltdl/libltdl/lt__argz_.h'
 libtoolize: copying file 'ltdl/libltdl/lt__dirent.h'
 libtoolize: copying file 'ltdl/libltdl/lt__glibc.h'
 libtoolize: copying file 'ltdl/libltdl/lt__private.h'
@@ -591,6 +590,7 @@ libtoolize: copying file 'ltdl/loaders/loadlibrary.c'
 libtoolize: copying file 'ltdl/loaders/preopen.c'
 libtoolize: copying file 'ltdl/loaders/shl_load.c'
 libtoolize: copying file 'ltdl/lt__alloc.c'
+libtoolize: copying file 'ltdl/lt__argz.c'
 libtoolize: copying file 'ltdl/lt__dirent.c'
 libtoolize: copying file 'ltdl/lt__strl.c'
 libtoolize: copying file 'ltdl/lt_dlloader.c'
@@ -883,8 +883,8 @@ libtoolize: copying file 'build-aux/config.sub'
 libtoolize: copying file 'build-aux/install-sh'
 libtoolize: copying file 'build-aux/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
-libtoolize: copying file 'm4/argz.m4'
 libtoolize: copying file 'm4/libtool.m4'
+libtoolize: copying file 'm4/ltargz.m4'
 libtoolize: copying file 'm4/ltdl.m4'
 libtoolize: copying file 'm4/ltoptions.m4'
 libtoolize: copying file 'm4/ltsugar.m4'
@@ -893,9 +893,8 @@ libtoolize: copying file 'm4/lt~obsolete.m4'
 libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, 'ltdl'.
 libtoolize: copying file 'ltdl/COPYING.LIB'
 libtoolize: copying file 'ltdl/README'
-libtoolize: copying file 'ltdl/argz_.h'
-libtoolize: copying file 'ltdl/argz.c'
 libtoolize: copying file 'ltdl/libltdl/lt__alloc.h'
+libtoolize: copying file 'ltdl/libltdl/lt__argz_.h'
 libtoolize: copying file 'ltdl/libltdl/lt__dirent.h'
 libtoolize: copying file 'ltdl/libltdl/lt__glibc.h'
 libtoolize: copying file 'ltdl/libltdl/lt__private.h'
@@ -912,6 +911,7 @@ libtoolize: copying file 'ltdl/loaders/loadlibrary.c'
 libtoolize: copying file 'ltdl/loaders/preopen.c'
 libtoolize: copying file 'ltdl/loaders/shl_load.c'
 libtoolize: copying file 'ltdl/lt__alloc.c'
+libtoolize: copying file 'ltdl/lt__argz.c'
 libtoolize: copying file 'ltdl/lt__dirent.c'
 libtoolize: copying file 'ltdl/lt__strl.c'
 libtoolize: copying file 'ltdl/lt_dlloader.c'
@@ -957,8 +957,8 @@ libtoolize: copying file 'acaux/install-sh'
 libtoolize: copying file 'acaux/missing'
 libtoolize: copying file 'acaux/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'acm4'.
-libtoolize: copying file 'acm4/argz.m4'
 libtoolize: copying file 'acm4/libtool.m4'
+libtoolize: copying file 'acm4/ltargz.m4'
 libtoolize: copying file 'acm4/ltdl.m4'
 libtoolize: copying file 'acm4/ltoptions.m4'
 libtoolize: copying file 'acm4/ltsugar.m4'
@@ -971,11 +971,10 @@ libtoolize: creating file 'ltdl/Makefile.in'
 libtoolize: copying file 'ltdl/README'
 libtoolize: creating file 'ltdl/configure.ac'
 libtoolize: creating file 'ltdl/aclocal.m4'
-libtoolize: copying file 'ltdl/argz_.h'
-libtoolize: copying file 'ltdl/argz.c'
 libtoolize: copying file 'ltdl/config-h.in'
 libtoolize: creating file 'ltdl/configure'
 libtoolize: copying file 'ltdl/libltdl/lt__alloc.h'
+libtoolize: copying file 'ltdl/libltdl/lt__argz_.h'
 libtoolize: copying file 'ltdl/libltdl/lt__dirent.h'
 libtoolize: copying file 'ltdl/libltdl/lt__glibc.h'
 libtoolize: copying file 'ltdl/libltdl/lt__private.h'
@@ -992,6 +991,7 @@ libtoolize: copying file 'ltdl/loaders/loadlibrary.c'
 libtoolize: copying file 'ltdl/loaders/preopen.c'
 libtoolize: copying file 'ltdl/loaders/shl_load.c'
 libtoolize: copying file 'ltdl/lt__alloc.c'
+libtoolize: copying file 'ltdl/lt__argz.c'
 libtoolize: copying file 'ltdl/lt__dirent.c'
 libtoolize: copying file 'ltdl/lt__strl.c'
 libtoolize: copying file 'ltdl/lt_dlloader.c'
@@ -1033,8 +1033,8 @@ libtoolize: linking file 'ltdl/install-sh'
 libtoolize: linking file 'ltdl/missing'
 libtoolize: linking file 'ltdl/ltmain.sh'
 libtoolize: putting macros in 'ltdl/m4'.
-libtoolize: linking file 'ltdl/m4/argz.m4'
 libtoolize: linking file 'ltdl/m4/libtool.m4'
+libtoolize: linking file 'ltdl/m4/ltargz.m4'
 libtoolize: linking file 'ltdl/m4/ltdl.m4'
 libtoolize: linking file 'ltdl/m4/ltoptions.m4'
 libtoolize: linking file 'ltdl/m4/ltsugar.m4'
@@ -1047,11 +1047,10 @@ libtoolize: creating file 'ltdl/Makefile.in'
 libtoolize: linking file 'ltdl/README'
 libtoolize: creating file 'ltdl/configure.ac'
 libtoolize: creating file 'ltdl/aclocal.m4'
-libtoolize: linking file 'ltdl/argz_.h'
-libtoolize: linking file 'ltdl/argz.c'
 libtoolize: linking file 'ltdl/config-h.in'
 libtoolize: creating file 'ltdl/configure'
 libtoolize: linking file 'ltdl/libltdl/lt__alloc.h'
+libtoolize: linking file 'ltdl/libltdl/lt__argz_.h'
 libtoolize: linking file 'ltdl/libltdl/lt__dirent.h'
 libtoolize: linking file 'ltdl/libltdl/lt__glibc.h'
 libtoolize: linking file 'ltdl/libltdl/lt__private.h'
@@ -1068,6 +1067,7 @@ libtoolize: linking file 'ltdl/loaders/loadlibrary.c'
 libtoolize: linking file 'ltdl/loaders/preopen.c'
 libtoolize: linking file 'ltdl/loaders/shl_load.c'
 libtoolize: linking file 'ltdl/lt__alloc.c'
+libtoolize: linking file 'ltdl/lt__argz.c'
 libtoolize: linking file 'ltdl/lt__dirent.c'
 libtoolize: linking file 'ltdl/lt__strl.c'
 libtoolize: linking file 'ltdl/lt_dlloader.c'

diff --git a/tests/ltdl-api.at b/tests/ltdl-api.at
index 4306467c2c65e0e5c9fa6d25a7001fd0541aa309..0e8909ffb817e3a78cdc378663107b0eed26d409 100644 (file)
--- a/tests/ltdl-api.at
+++ b/tests/ltdl-api.at
@@ -27,9 +27,9 @@ AT_KEYWORDS([libltdl])
 
 # Ensure that no symbols from argz are unrenamed.
 eval `$LIBTOOL --config | $EGREP '^(NM|global_symbol_pipe|objext)='`
-argz_o=$abs_top_builddir/libltdl/argz.$objext
-AT_CHECK([test -f "$argz_o" || exit 77])
-AT_CHECK([eval "$NM \"\$argz_o\" | $global_symbol_pipe"],
+lt__argz_o=$abs_top_builddir/libltdl/lt__argz.$objext
+AT_CHECK([test -f "$lt__argz_o" || exit 77])
+AT_CHECK([eval "$NM \"\$lt__argz_o\" | $global_symbol_pipe"],
         [], [stdout], [ignore])
 # Check for global symbols beginning with "argz_"
 AT_CHECK([$GREP "^T argz_" stdout], [1])

diff --git a/tests/nonrecursive.at b/tests/nonrecursive.at
index 0d1006d90ffc82f689c43ed64c6cf8541c6b73a6..751d8193c76ae6902a5e228a49b1f83cffc7720a 100644 (file)
--- a/tests/nonrecursive.at
+++ b/tests/nonrecursive.at
@@ -84,7 +84,7 @@ LT_AT_LIBTOOLIZE([--ltdl])
 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
+for file in lt__argz.c lt__dirent.c lt__strl.c; do
   cp ltdl/$file $file
 done
 
@@ -108,7 +108,7 @@ LT_AT_LIBTOOLIZE([--copy --ltdl])
 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
+for file in lt__argz.c lt__dirent.c lt__strl.c; do
   cp ltdl/$file $file
 done
 
@@ -134,7 +134,7 @@ LT_AT_LIBTOOLIZE([--copy --ltdl])
 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
+for file in lt__argz.c lt__dirent.c lt__strl.c; do
   cp ltdl/$file $file
 done
 

diff --git a/tests/old-ltdl-iface.at b/tests/old-ltdl-iface.at
index d636336c163daa06e41324003dc18d47f0bcd731..524cac1683ddf8e11b47d9807794e3ae5ae784fe 100644 (file)
--- a/tests/old-ltdl-iface.at
+++ b/tests/old-ltdl-iface.at
@@ -82,8 +82,8 @@ libtoolize: linking file './config.sub'
 libtoolize: linking file './install-sh'
 libtoolize: linking file './ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
-libtoolize: linking file 'm4/argz.m4'
 libtoolize: linking file 'm4/libtool.m4'
+libtoolize: linking file 'm4/ltargz.m4'
 libtoolize: linking file 'm4/ltdl.m4'
 libtoolize: linking file 'm4/ltoptions.m4'
 libtoolize: linking file 'm4/ltsugar.m4'
@@ -92,9 +92,8 @@ libtoolize: linking file 'm4/lt~obsolete.m4'
 libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, 'ltdl'.
 libtoolize: linking file 'ltdl/COPYING.LIB'
 libtoolize: linking file 'ltdl/README'
-libtoolize: linking file 'ltdl/argz_.h'
-libtoolize: linking file 'ltdl/argz.c'
 libtoolize: linking file 'ltdl/libltdl/lt__alloc.h'
+libtoolize: linking file 'ltdl/libltdl/lt__argz_.h'
 libtoolize: linking file 'ltdl/libltdl/lt__dirent.h'
 libtoolize: linking file 'ltdl/libltdl/lt__glibc.h'
 libtoolize: linking file 'ltdl/libltdl/lt__private.h'
@@ -111,6 +110,7 @@ libtoolize: linking file 'ltdl/loaders/loadlibrary.c'
 libtoolize: linking file 'ltdl/loaders/preopen.c'
 libtoolize: linking file 'ltdl/loaders/shl_load.c'
 libtoolize: linking file 'ltdl/lt__alloc.c'
+libtoolize: linking file 'ltdl/lt__argz.c'
 libtoolize: linking file 'ltdl/lt__dirent.c'
 libtoolize: linking file 'ltdl/lt__strl.c'
 libtoolize: linking file 'ltdl/lt_dlloader.c'