* libtoolize.m4sh (func_massage_pkgvmacro_DATA): New function

to calculate the macro filenames to be copied by libtoolize.
* Makefile.am (edit): Substitute pkgvmacro_DATA.

diff --git a/ChangeLog b/ChangeLog
index d23e7b36e25a72636cae88ed530942e0eb993dc5..8aa87311af2a1724527fd4bd9be8b27b3a6c6045 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-03-15  Gary V. Vaughan  <gary@gnu.org>
 
+       * libtoolize.m4sh (func_massage_pkgvmacro_DATA): New function
+       to calculate the macro filenames to be copied by libtoolize.
+       * Makefile.am (edit): Substitute pkgvmacro_DATA.
+
        * bootstrap: Need to generate tests/package.m4 from Makefile.am
        before generating tests/testsuite from tests/Makefile.am, or
        else bootstrap of a fresh checkout fails.

diff --git a/Makefile.am b/Makefile.am
index ccef2726d365abed968bd99c32691c5aca8dc16b..da6c985878f4c23758380ccdab51ede821b6b6b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 ##
-## Copyright (C) 2003, 2004 Free Software Foundation
+## Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -43,6 +43,7 @@ edit = sed \
        -e 's,@host_triplet\@,$(host_triplet),g' \
        -e 's,@pkgvdatadir\@,$(pkgvdatadir),g' \
        -e 's,@pkgvmacrodir\@,$(pkgvmacrodir),g' \
+       -e 's,@pkgvmacro_DATA\@,$(pkgvmacro_DATA),g' \
        -e 's,@prefix\@,$(prefix),g' \
        -e "s,@configure_input\@,Generated from $$input; do not edit by hand,g"
 
@@ -88,8 +89,6 @@ dist_pkgvdata_DATA = config/config.guess config/config.sub config/ltmain.sh \
 
 # Everything that gets picked up by aclocal is automatically distributed,
 # this is the list of macro files we install on the user's system.
-# NOTE: Ensure that PKGVMACRO_FILES in libtoolize.in is updated if you
-#       change the contents of aclocal_DATA:
 pkgvmacro_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \
        m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
 

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index c3d38e51912a8f99b54650621ead9f91d93bafd5..ad10756c8fef683d94a031d1876a27fa54a2d621 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -821,6 +821,31 @@ func_check_macros ()
 }
 
 
+# func_massage_pkgvmacro_DATA [glob_exclude]
+# @pkgvmacro_DATA\@ is substituted as per its value in Makefile.am; this
+# function massages it into a suitable format for func_copy_some_files.
+func_massage_pkgvmacro_DATA ()
+{
+    pkgvmacro_files=     # GLOBAL VAR
+
+    my_glob_exclude="$1"
+
+    # Massage a value for pkgvmacro_files from the value used in Makefile.am.
+    for my_filename in @pkgvmacro_DATA@; do
+      my_filename=`$ECHO "X$my_filename" | $Xsed -e "$basename"`
+
+       # ignore excluded filenames
+      if test -n "$my_glob_exclude"; then
+        eval 'case $my_filename in '$my_glob_exclude') continue ;; esac'
+      fi
+
+      pkgvmacro_files="$pkgvmacro_files:$my_filename"
+    done
+
+    # strip spurious leading `:'
+    pkgvmacro_files=`$ECHO "X$pkgvmacro_files" | $Xsed -e 's,^:*,,'`
+}
+
 
 ## ----------- ##
 ##    Main.    ##
@@ -829,10 +854,8 @@ func_check_macros ()
 {
   rerun_aclocal=false
 
-  # NOTE: PKGVMACRO_FILES must be kept in synch with pkgvmacro_DATA in the
-  #       libtool top_srcdir/Makefile.am (libtool.m4 and ltdl.m4 are handled
-  #       specially below though, so don't add them here):
-  pkgvmacro_files='argz.m4:ltoptions.m4:ltsugar.m4:ltversion.m4'
+  # libtool.m4 and ltdl.m4 are handled specially below
+  func_massage_pkgvmacro_DATA 'libtool.m4|ltdl.m4'
 
   glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'