libtoolize: massage installed libltdl file list at make time.

* libtoolize.m4sh (pkgltdldir, pkgdatadir): Put installable
libltdl files in pkgdatadir. When testing, and _lt_pkgdatadir
is set, adjust to look in libltdl subdirectory.
(func_massage_pkgltdl_files): Removed function and only caller,
because...
(pkgltdl_files): ...we substitute the pre-massaged files
directly...
(func_install_pkgltdl_files): ...from here.
Adjust installation of specially handled additional files.
* Makefile.am (ltdldir): Location of libltdl files in source
tree.
(ltdldest, ltdldatafiles): Removed.
(pkgltdl_files): New pre-massaged list of libltdl sources.
(install-data-local, uninstall-hook): Use it.
* tests/libtoolize.at: Reorder expected output to match actual
libtoolize output.

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

diff --git a/Makefile.am b/Makefile.am
index 34e6bd7e98a5a1158b6d535cf492ebfdcc66f38e..749df98bdc26022bb06e1db712c579437fb22c8c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -284,7 +284,7 @@ configure_edit = $(SED) \
        -e 's,@macro_dir\@,$(macro_dir),g' \
        -e "s,@pkgconfig_files\@,$(auxfiles),g" \
        -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
-       -e "s,@pkgltdl_files\@,$(ltdldatafiles),g" \
+       -e 's,@pkgltdl_files\@,$(pkgltdl_files),g' \
        -e 's,@pkgmacro_files\@,$(pkgmacro_files),g' \
        -e 's,@prefix\@,$(prefix),g' \
        -e 's,@SED\@,$(SED),g' \
@@ -437,6 +437,8 @@ $(libtoolize_1): $(libtoolize_in)
 ## Installation. ##
 ## ------------- ##
 
+ltdldir                = $(srcdir)/libltdl
+
 # The timestamps on these files must be preserved carefully so we install,
 # uninstall and set executable with custom rules here.
 auxfiles       = $(pkgaux_scripts) config/ltmain.sh
@@ -448,26 +450,41 @@ pkgmacro_files    = argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 \
 
 ## These are installed as a subdirectory of pkgdatadir so that
 ## libtoolize --ltdl can find them later:
-ltdldatafiles  = libltdl/COPYING.LIB \
-                 libltdl/README \
-                 libltdl/Makefile.inc \
-                 libltdl/Makefile.am \
-                 libltdl/configure.ac \
-                 libltdl/aclocal.m4 \
-                 libltdl/Makefile.in \
-                 libltdl/config-h.in \
-                 libltdl/configure \
-                 libltdl/argz_.h \
-                 libltdl/argz.c \
-                 libltdl/loaders/dld_link.c \
-                 libltdl/loaders/dlopen.c \
-                 libltdl/loaders/dyld.c \
-                 libltdl/loaders/load_add_on.c \
-                 libltdl/loaders/loadlibrary.c \
-                 libltdl/loaders/shl_load.c \
-                 libltdl/lt__dirent.c \
-                 libltdl/lt__strl.c \
-                 $(libltdl_libltdl_la_SOURCES)
+pkgltdl_files  = COPYING.LIB \
+                 Makefile.am \
+                 Makefile.in \
+                 Makefile.inc \
+                 README \
+                 aclocal.m4 \
+                 argz_.h \
+                 argz.c \
+                 config-h.in \
+                 configure \
+                 configure.ac \
+                 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 \
+                 slist.c
 
 install-data-local: $(lt_Makefile_in)
        @$(NORMAL_INSTALL)
@@ -488,15 +505,20 @@ install-data-local: $(lt_Makefile_in)
          echo " $(INSTALL_SCRIPT) '$(srcdir)/$(ltdl_dir)/$$p' '$(DESTDIR)$(pkgdatadir)/$$p'"; \
          $(INSTALL_SCRIPT) "$(srcdir)/$(ltdl_dir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
        done
-       $(INSTALL_DATA) "$(ltmain_sh)" "$(DESTDIR)$(pkgdatadir)/config/ltmain.sh" 
+       @list='$(auxfiles)' && for p in $$list; do \
+         d=`echo "$(DESTDIR)$(pkgdatadir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
+         test -d "$$d" || $(mkinstalldirs) "$$d"; \
+         echo " $(INSTALL_DATA) '$(srcdir)/$(ltdl_dir)/$$p' '$(DESTDIR)$(pkgdatadir)/$$p'"; \
+         $(INSTALL_DATA) "$(srcdir)/$(ltdl_dir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
+       done
 ## install the libltdl files
-       @list='$(ltdldatafiles)' && for p in $$list; do \
+       @list='$(pkgltdl_files)' && for p in $$list; do \
          d=`echo "$(DESTDIR)$(pkgdatadir)/$$p" |$(SED) 's,[^/]*$$,,'`; \
          test -d "$$d" || $(mkinstalldirs) "$$d"; \
-         echo " $(INSTALL_DATA) '$(srcdir)/$$p' '$(DESTDIR)$(pkgdatadir)/$$p'"; \
-         $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
+         echo " $(INSTALL_DATA) '$(ltdldir)/$$p' '$(DESTDIR)$(pkgdatadir)/$$p'"; \
+         $(INSTALL_DATA) "$(ltdldir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
        done
-       -chmod a+x '$(DESTDIR)$(pkgdatadir)/libltdl/configure'
+       -chmod a+x '$(DESTDIR)$(pkgdatadir)/configure'
 
 
 ## ------------- ##
@@ -556,7 +578,7 @@ dist-hook: $(changelog) $(dotversion) $(readme)
 
 uninstall-hook:
        @$(NORMAL_UNINSTALL)
-       @list='$(ltdldatafiles) $(auxfiles)'; for f in $$list; do \
+       @list='$(pkgltdl_files) $(auxfiles)'; for f in $$list; do \
          echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
          rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
        done

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index bea217e0228421f8fe2c3dcb36aa4f26cd7a95bc..85600e7cdaed6f61141531403d861a2cd5a63109 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -879,39 +879,6 @@ func_install_pkgmacro_files ()
 }
 
 
-# func_massage_pkgltdl_files [glob_exclude]
-# @pkgltdl_files\@ is substituted as per its value in Makefile.am; this
-# function massages it into a suitable format for func_copy_some_files.
-func_massage_pkgltdl_files ()
-{
-    $debug_cmd
-
-    pkgltdl_files=     # GLOBAL VAR
-
-    my_glob_exclude="$1"
-
-    # Massage a value for pkgltdl_files from the value used in Makefile.am
-    for my_filename in @pkgltdl_files@; do
-
-      # Strip surplus leading 'libltdl/':
-      my_filename=`expr "X$my_filename" : 'Xlibltdl/\(.*\)'`
-
-      # ignore excluded filenames
-      if test -n "$my_glob_exclude"; then
-       my_cont=false
-       eval 'case $my_filename in '$my_glob_exclude') my_cont=: ;; esac'
-       $my_cont && continue
-      fi
-
-      # ignore duplicates
-      case " "$pkgltdl_files" " in
-        *" $my_filename "*) ;;
-       *) pkgltdl_files="${pkgltdl_files+$pkgltdl_files }$my_filename" ;;
-      esac
-    done
-}
-
-
 # func_install_pkgltdl_files
 # Install copies of the libltdl files into this package.  Any auxiliary
 # or m4 macro files needed in the libltdl tree will also be copied by
@@ -941,25 +908,28 @@ func_install_pkgltdl_files ()
       pkgltdl_header="putting libltdl files in \`$ltdl_dir'."
     fi
 
-    # These files are handled specially, depending on ltdl_mode:
-    if test "x$ltdl_mode" = "xsubproject"; then
-      func_massage_pkgltdl_files 'Makefile.inc'
-    else
-      func_massage_pkgltdl_files 'Makefile.am|Makefile.in*|aclocal.m4|config*'
-    fi
-
-    func_copy_some_files "$pkgltdl_files" \
-      "$pkgltdldir/libltdl" "$ltdl_dir" pkgltdl_header
-
-    # For recursive ltdl modes, copy a suitable Makefile.{am,inc}:
-    case $ltdl_mode in
-      recursive)
-        func_fixup_Makefile "Makefile.am" "$pkgltdldir/libltdl" "$ltdl_dir"
-        ;;
-      nonrecursive)
-        func_fixup_Makefile "Makefile.inc" "$pkgltdldir/libltdl" "$ltdl_dir"
-        ;;
-    esac
+    # Copy ltdl sources appropriate to the requested ltdl_mode.
+    for file in $pkgltdl_files; do
+      case $file in
+        Makefile.am|Makefile.in)
+          test recursive = "$ltdl_mode" \
+            && func_fixup_Makefile "$file" "$pkgltdldir" "$ltdl_dir"
+          test subproject = "$ltdl_mode" \
+            && func_copy "$pkgltdldir/$file" "$ltdl_dir/$file" pkgltdl_header
+          ;;
+        Makefile.inc)
+          test nonrecursive = "$ltdl_mode" \
+            && func_fixup_Makefile "$file" "$pkgltdldir" "$ltdl_dir"
+          ;;
+        aclocal.m4|config-h.in|configure|configure.ac)
+          test subproject = "$ltdl_mode" \
+            && func_copy "$pkgltdldir/$file" "$ltdl_dir/$file" pkgltdl_header
+          ;;
+        *)
+          func_copy "$pkgltdldir/$file" "$ltdl_dir/$file" pkgltdl_header
+          ;;
+      esac
+    done
 }
 
 
@@ -1663,8 +1633,10 @@ func_require_seen_libtool ()
   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 slist.c"
 
-  # Files installed by func_install_pkgmacro_files(), not including
-  # libtool.m4 and ltdl.m4 which are handled specially.
+  # Files installed by func_install_*, some files are missing from these
+  # lists deliberately because their respective func_install has to handle
+  # the missing filenames specially.
+  pkgltdl_files="@pkgltdl_files@"
   pkgmacro_files="@pkgmacro_files@"
 
   # Locations for important files:
@@ -1689,7 +1661,7 @@ func_require_seen_libtool ()
 
   # Allow the user to override the master libtoolize repository:
   if test -n "$_lt_pkgdatadir"; then
-    pkgltdldir="$_lt_pkgdatadir"
+    pkgltdldir="$_lt_pkgdatadir/libltdl"
     pkgdatadir="$_lt_pkgdatadir/libltdl"
     aclocaldir="$_lt_pkgdatadir/libltdl/m4"
   fi

diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index d3500957d012ad08563fb8c3def3b31bf79eaed4..55520b559309c2e30ea9c5158f571976ef547d0a 100644 (file)
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -296,17 +296,10 @@ libtoolize: copying file `m4/ltversion.m4'
 libtoolize: copying file `m4/lt~obsolete.m4'
 libtoolize: putting libltdl files in `ltdl'.
 libtoolize: copying file `ltdl/COPYING.LIB'
+libtoolize: creating file `ltdl/Makefile.inc'
 libtoolize: copying file `ltdl/README'
 libtoolize: copying file `ltdl/argz_.h'
 libtoolize: copying file `ltdl/argz.c'
-libtoolize: copying file `ltdl/loaders/dld_link.c'
-libtoolize: copying file `ltdl/loaders/dlopen.c'
-libtoolize: copying file `ltdl/loaders/dyld.c'
-libtoolize: copying file `ltdl/loaders/load_add_on.c'
-libtoolize: copying file `ltdl/loaders/loadlibrary.c'
-libtoolize: copying file `ltdl/loaders/shl_load.c'
-libtoolize: copying file `ltdl/lt__dirent.c'
-libtoolize: copying file `ltdl/lt__strl.c'
 libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
 libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
 libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
@@ -316,14 +309,21 @@ libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
 libtoolize: copying file `ltdl/libltdl/lt_error.h'
 libtoolize: copying file `ltdl/libltdl/lt_system.h'
 libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+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__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
 libtoolize: copying file `ltdl/lt_dlloader.c'
 libtoolize: copying file `ltdl/lt_error.c'
 libtoolize: copying file `ltdl/ltdl.c'
 libtoolize: copying file `ltdl/ltdl.h'
 libtoolize: copying file `ltdl/slist.c'
-libtoolize: creating file `ltdl/Makefile.inc'
 libtoolize: Remember to add `LT_CONFIG_LTDL_DIR([ltdl])' to `configure.ac'.
 libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
 ]])
@@ -369,23 +369,15 @@ libtoolize: linking file `ltdl/m4/ltversion.m4'
 libtoolize: linking file `ltdl/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/Makefile.am'
-libtoolize: linking file `ltdl/configure.ac'
-libtoolize: copying file `ltdl/aclocal.m4'
 libtoolize: linking file `ltdl/Makefile.in'
-libtoolize: linking file `ltdl/config-h.in'
-libtoolize: linking file `ltdl/configure'
+libtoolize: linking file `ltdl/README'
+libtoolize: copying file `ltdl/aclocal.m4'
 libtoolize: linking file `ltdl/argz_.h'
 libtoolize: linking file `ltdl/argz.c'
-libtoolize: linking file `ltdl/loaders/dld_link.c'
-libtoolize: linking file `ltdl/loaders/dlopen.c'
-libtoolize: linking file `ltdl/loaders/dyld.c'
-libtoolize: linking file `ltdl/loaders/load_add_on.c'
-libtoolize: linking file `ltdl/loaders/loadlibrary.c'
-libtoolize: linking file `ltdl/loaders/shl_load.c'
-libtoolize: linking file `ltdl/lt__dirent.c'
-libtoolize: linking file `ltdl/lt__strl.c'
+libtoolize: linking file `ltdl/config-h.in'
+libtoolize: linking file `ltdl/configure'
+libtoolize: linking file `ltdl/configure.ac'
 libtoolize: linking file `ltdl/libltdl/lt__alloc.h'
 libtoolize: linking file `ltdl/libltdl/lt__dirent.h'
 libtoolize: linking file `ltdl/libltdl/lt__glibc.h'
@@ -395,8 +387,16 @@ libtoolize: linking file `ltdl/libltdl/lt_dlloader.h'
 libtoolize: linking file `ltdl/libltdl/lt_error.h'
 libtoolize: linking file `ltdl/libltdl/lt_system.h'
 libtoolize: linking file `ltdl/libltdl/slist.h'
+libtoolize: linking file `ltdl/loaders/dld_link.c'
+libtoolize: linking file `ltdl/loaders/dlopen.c'
+libtoolize: linking file `ltdl/loaders/dyld.c'
+libtoolize: linking file `ltdl/loaders/load_add_on.c'
+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__dirent.c'
+libtoolize: linking file `ltdl/lt__strl.c'
 libtoolize: linking file `ltdl/lt_dlloader.c'
 libtoolize: linking file `ltdl/lt_error.c'
 libtoolize: linking file `ltdl/ltdl.c'
@@ -468,23 +468,15 @@ libtoolize: copying file `ltdl/m4/ltversion.m4'
 libtoolize: copying file `ltdl/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/Makefile.am'
-libtoolize: copying file `ltdl/configure.ac'
-libtoolize: copying file `ltdl/aclocal.m4'
 libtoolize: copying file `ltdl/Makefile.in'
-libtoolize: copying file `ltdl/config-h.in'
-libtoolize: copying file `ltdl/configure'
+libtoolize: copying file `ltdl/README'
+libtoolize: copying file `ltdl/aclocal.m4'
 libtoolize: copying file `ltdl/argz_.h'
 libtoolize: copying file `ltdl/argz.c'
-libtoolize: copying file `ltdl/loaders/dld_link.c'
-libtoolize: copying file `ltdl/loaders/dlopen.c'
-libtoolize: copying file `ltdl/loaders/dyld.c'
-libtoolize: copying file `ltdl/loaders/load_add_on.c'
-libtoolize: copying file `ltdl/loaders/loadlibrary.c'
-libtoolize: copying file `ltdl/loaders/shl_load.c'
-libtoolize: copying file `ltdl/lt__dirent.c'
-libtoolize: copying file `ltdl/lt__strl.c'
+libtoolize: copying file `ltdl/config-h.in'
+libtoolize: copying file `ltdl/configure'
+libtoolize: copying file `ltdl/configure.ac'
 libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
 libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
 libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
@@ -494,8 +486,16 @@ libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
 libtoolize: copying file `ltdl/libltdl/lt_error.h'
 libtoolize: copying file `ltdl/libltdl/lt_system.h'
 libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+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__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
 libtoolize: copying file `ltdl/lt_dlloader.c'
 libtoolize: copying file `ltdl/lt_error.c'
 libtoolize: copying file `ltdl/ltdl.c'
@@ -798,17 +798,10 @@ libtoolize: copying file `m4/ltversion.m4'
 libtoolize: copying file `m4/lt~obsolete.m4'
 libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, `ltdl'.
 libtoolize: copying file `ltdl/COPYING.LIB'
+libtoolize: creating file `ltdl/Makefile.inc'
 libtoolize: copying file `ltdl/README'
 libtoolize: copying file `ltdl/argz_.h'
 libtoolize: copying file `ltdl/argz.c'
-libtoolize: copying file `ltdl/loaders/dld_link.c'
-libtoolize: copying file `ltdl/loaders/dlopen.c'
-libtoolize: copying file `ltdl/loaders/dyld.c'
-libtoolize: copying file `ltdl/loaders/load_add_on.c'
-libtoolize: copying file `ltdl/loaders/loadlibrary.c'
-libtoolize: copying file `ltdl/loaders/shl_load.c'
-libtoolize: copying file `ltdl/lt__dirent.c'
-libtoolize: copying file `ltdl/lt__strl.c'
 libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
 libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
 libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
@@ -818,14 +811,21 @@ libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
 libtoolize: copying file `ltdl/libltdl/lt_error.h'
 libtoolize: copying file `ltdl/libltdl/lt_system.h'
 libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+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__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
 libtoolize: copying file `ltdl/lt_dlloader.c'
 libtoolize: copying file `ltdl/lt_error.c'
 libtoolize: copying file `ltdl/ltdl.c'
 libtoolize: copying file `ltdl/ltdl.h'
 libtoolize: copying file `ltdl/slist.c'
-libtoolize: creating file `ltdl/Makefile.inc'
 ]])
 
 AT_DATA([configure.ac],
@@ -885,23 +885,15 @@ libtoolize: copying file `ltdl/m4/ltversion.m4'
 libtoolize: copying file `ltdl/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/Makefile.am'
-libtoolize: copying file `ltdl/configure.ac'
-libtoolize: copying file `ltdl/aclocal.m4'
 libtoolize: copying file `ltdl/Makefile.in'
-libtoolize: copying file `ltdl/config-h.in'
-libtoolize: copying file `ltdl/configure'
+libtoolize: copying file `ltdl/README'
+libtoolize: copying file `ltdl/aclocal.m4'
 libtoolize: copying file `ltdl/argz_.h'
 libtoolize: copying file `ltdl/argz.c'
-libtoolize: copying file `ltdl/loaders/dld_link.c'
-libtoolize: copying file `ltdl/loaders/dlopen.c'
-libtoolize: copying file `ltdl/loaders/dyld.c'
-libtoolize: copying file `ltdl/loaders/load_add_on.c'
-libtoolize: copying file `ltdl/loaders/loadlibrary.c'
-libtoolize: copying file `ltdl/loaders/shl_load.c'
-libtoolize: copying file `ltdl/lt__dirent.c'
-libtoolize: copying file `ltdl/lt__strl.c'
+libtoolize: copying file `ltdl/config-h.in'
+libtoolize: copying file `ltdl/configure'
+libtoolize: copying file `ltdl/configure.ac'
 libtoolize: copying file `ltdl/libltdl/lt__alloc.h'
 libtoolize: copying file `ltdl/libltdl/lt__dirent.h'
 libtoolize: copying file `ltdl/libltdl/lt__glibc.h'
@@ -911,8 +903,16 @@ libtoolize: copying file `ltdl/libltdl/lt_dlloader.h'
 libtoolize: copying file `ltdl/libltdl/lt_error.h'
 libtoolize: copying file `ltdl/libltdl/lt_system.h'
 libtoolize: copying file `ltdl/libltdl/slist.h'
+libtoolize: copying file `ltdl/loaders/dld_link.c'
+libtoolize: copying file `ltdl/loaders/dlopen.c'
+libtoolize: copying file `ltdl/loaders/dyld.c'
+libtoolize: copying file `ltdl/loaders/load_add_on.c'
+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__dirent.c'
+libtoolize: copying file `ltdl/lt__strl.c'
 libtoolize: copying file `ltdl/lt_dlloader.c'
 libtoolize: copying file `ltdl/lt_error.c'
 libtoolize: copying file `ltdl/ltdl.c'
@@ -963,23 +963,15 @@ libtoolize: linking file `ltdl/m4/ltversion.m4'
 libtoolize: linking file `ltdl/m4/lt~obsolete.m4'
 libtoolize: putting libltdl files in `ltdl'.
 libtoolize: linking file `ltdl/COPYING.LIB'
-libtoolize: linking file `ltdl/README'
 libtoolize: linking file `ltdl/Makefile.am'
-libtoolize: linking file `ltdl/configure.ac'
-libtoolize: copying file `ltdl/aclocal.m4'
 libtoolize: linking file `ltdl/Makefile.in'
-libtoolize: linking file `ltdl/config-h.in'
-libtoolize: linking file `ltdl/configure'
+libtoolize: linking file `ltdl/README'
+libtoolize: copying file `ltdl/aclocal.m4'
 libtoolize: linking file `ltdl/argz_.h'
 libtoolize: linking file `ltdl/argz.c'
-libtoolize: linking file `ltdl/loaders/dld_link.c'
-libtoolize: linking file `ltdl/loaders/dlopen.c'
-libtoolize: linking file `ltdl/loaders/dyld.c'
-libtoolize: linking file `ltdl/loaders/load_add_on.c'
-libtoolize: linking file `ltdl/loaders/loadlibrary.c'
-libtoolize: linking file `ltdl/loaders/shl_load.c'
-libtoolize: linking file `ltdl/lt__dirent.c'
-libtoolize: linking file `ltdl/lt__strl.c'
+libtoolize: linking file `ltdl/config-h.in'
+libtoolize: linking file `ltdl/configure'
+libtoolize: linking file `ltdl/configure.ac'
 libtoolize: linking file `ltdl/libltdl/lt__alloc.h'
 libtoolize: linking file `ltdl/libltdl/lt__dirent.h'
 libtoolize: linking file `ltdl/libltdl/lt__glibc.h'
@@ -989,8 +981,16 @@ libtoolize: linking file `ltdl/libltdl/lt_dlloader.h'
 libtoolize: linking file `ltdl/libltdl/lt_error.h'
 libtoolize: linking file `ltdl/libltdl/lt_system.h'
 libtoolize: linking file `ltdl/libltdl/slist.h'
+libtoolize: linking file `ltdl/loaders/dld_link.c'
+libtoolize: linking file `ltdl/loaders/dlopen.c'
+libtoolize: linking file `ltdl/loaders/dyld.c'
+libtoolize: linking file `ltdl/loaders/load_add_on.c'
+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__dirent.c'
+libtoolize: linking file `ltdl/lt__strl.c'
 libtoolize: linking file `ltdl/lt_dlloader.c'
 libtoolize: linking file `ltdl/lt_error.c'
 libtoolize: linking file `ltdl/ltdl.c'