284-gary-report-macro-files-for-aclocal.diff

[Gary V. Vaughan]

* Ralf Wildenhues <address@hidden> wrote:
> Yes, but argz.m4 is still missing.

Oh, yes. /me slaps forehead.  Thanks!

Okay to commit this version?

Cheers,
        Gary.

 libtoolize.m4sh |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

Index: libtool--devo--1.0/ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * libtoolize.m4sh: Copying just libtool.m4 for hand maintained
        aclocal.m4 doesn't work.  List all required files in that case.
        Also, list the additional files required when using libltdl.
        Reported by Patrick Welche <address@hidden>.

Index: libtool--devo--1.0/libtoolize.m4sh
===================================================================
--- libtool--devo--1.0.orig/libtoolize.m4sh
+++ libtool--devo--1.0/libtoolize.m4sh
@@ -996,7 +996,17 @@ func_nonemptydir_p ()
     func_copy_some_files "$pkgmacro_files" "$aclocaldir" \
       "$m4dir" func_serial_update
   else
-      $opt_quiet || func_echo "You should add the contents of 
\`$aclocaldir/libtool.m4' to \`aclocal.m4'."
+      $opt_quiet || {
+          func_echo "You should add the contents of the following files to 
\`aclocal.m4':"
+         for need in libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4; do
+             func_echo "\`$aclocaldir/$need'"
+         done
+         if $seen_ltdl || $opt_ltdl; then
+             for need in argz.m4 ltdl.m4; do
+                 func_echo "\`$aclocaldir/$need'"
+             done
+         fi
+      }
   fi
 
   # Suggest modern idioms for storing autoconf macros:
-- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook