* libtoolize.m4sh (func_scan_files): Support projects that have

upgraded libtool, but still use an old autoconf.  When the libtool
macros are not copied (because of missing ACLOCAL_AMFLAGS and
AC_CONFIG_MACRO_DIR ), point them at the libtoolize master tree
for files to manually copy into acinclude.m4 or aclocal.m4.

diff --git a/ChangeLog b/ChangeLog
index a7fb34c83b2cc1b8816cb0bc6727ce34c605de6e..5c8c4e0029a9d16b80be1407416007e27b8bbc18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-09-27  Gary V. Vaughan  <gary@gnu.org>
 
+       * libtoolize.m4sh (func_scan_files): Support projects that have
+       upgraded libtool, but still use an old autoconf.  When the libtool
+       macros are not copied (because of missing ACLOCAL_AMFLAGS and
+       AC_CONFIG_MACRO_DIR ), point them at the libtoolize master tree
+       for files to manually copy into acinclude.m4 or aclocal.m4.
+
        * libltdl/lt_error.c (lt__last_error, lt__error_strings): The lt__
        prefix is used to indicate internal symbols that are only exported
        for use by other parts of libltdl.  These are now static, so...

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 2c78cdddceb390ec6067cc4b798508a0c0b70105..4bb4e45c96e11e3771501a1e8f73eca0d76a2189 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -368,7 +368,7 @@ func_scan_files ()
            s,^.*AC_CONFIG_AUX_DIR([[[  ]*\([^])]]*\).*$,auxdir=\1,; p;
         };
        /AC_CONFIG_MACRO_DIR(/ {
-           s,^.*AC_CONFIG_MACRO_DIR([[[        ]*\([^])]]*\).*$,m4dir=\1,; p;
+           s,^.*AC_CONFIG_MACRO_DIR([[[        ]*\([^])]]*\).*$,macrodir=\1,; p;
         };
        /A[[CM]]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
        /LT_INIT/            { s,^.*$,seen_libtool=:,; p; };
@@ -421,6 +421,7 @@ func_scan_files ()
     my_sed_aclocal_flags='/^[[         ]]*ACLOCAL_[[A-Z_]]*FLAGS[[     ]]*=/ {
        s,^[[^=]]*=[[   ]]*\(.*\), \1,; q; };
        d'
+    m4dir="$macrodir"
     if test ! -n "$m4dir" && test -f Makefile.am; then
       my_m4dir_is_next=false
       for arg in `$SED "$my_sed_aclocal_flags" Makefile.am`; do
@@ -629,11 +630,11 @@ func_serial_update ()
     # Do this after the copy for hand maintained `aclocal.m4', incase
     # it has `m4_include([DESTFILE])', so the copy effectively already
     # updated `aclocal.m4'.
-    $use_aclocal || if test -f aclocal.m4; then
+    if test -f aclocal.m4; then
       func_serial_max \
           "$my_src_serial" `func_serial aclocal.m4 "$my_macro_regex"`
       test "X$my_src_serial" = "X$func_serial_max_result" \
-         && func_echo "You should add the contents of \'$my_destfile' to \`aclocal.m4'."
+         && func_echo "You should add the contents of \`$my_destfile' to \`aclocal.m4'."
     fi
 
     return $my_return_status
@@ -948,9 +949,19 @@ func_nonemptydir_p ()
     func_copy_some_files "$pkgmacro_files" "$aclocaldir" \
       "$m4dir" func_serial_update
   else
-    func_verbose "AC_CONFIG_MACRO_DIR not defined, not copying libtool macro files."
+      $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"
+      else
+        func_echo "consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to $configure.ac"
+      fi
+    fi
+
   # Offer some suggestions for avoiding duplicate files in a project
   # that uses libltdl:
   if test -n "$ltdldir" && $seen_autoconf; then