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

[Gary V. Vaughan]

Ralf Wildenhues wrote:
> Case $seen_ltdl || $opt_ltdl:
> 
> If not $seen_autoconf, I don't _need_ any of the m4 files.
> If $seen_autoconf, I get the warnings
> | libtoolize: consider using `AC_CONFIG_AUX_DIR([libltdl/config])' in 
> configure.ac
> | libtoolize: consider using `AC_CONFIG_MACRO_DIR([libltdl/m4])' in 
> configure.ac
>
> as well, but then I should not be recommended to copy anything into
> aclocal.m4.  Was this clear?

Not entirely... is this what you meant?

 libtoolize.m4sh |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

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
@@ -995,17 +995,29 @@ 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'."
   fi
 
   # Suggest modern idioms for storing autoconf macros:
   $opt_quiet || \
-    if test -z "$macrodir$ltdldir" && $seen_autoconf; then
-      if test x"$m4dir" = x.; then
-        func_echo "add \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac to store 
autoconf macros"
+    if $seen_autoconf; then
+      if test -z "$macrodir$ltdldir"; then
+       if test x"$m4dir" = x.; then
+         func_echo "add \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac and 
rerun libtoolize,"
+         func_echo "to keep the correct libtool macros in-tree."
+       else
+         func_echo "consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to 
$configure.ac,"
+         func_echo "and rerunning libtoolize."
+       fi
       else
-        func_echo "consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to 
$configure.ac"
+        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
     fi
 

-- 
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