libtool--gary--1.0--patch-21

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Okay to apply?
- -- 
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
_________________________________________________________
This patch notification generated by tlaapply version 0.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)

iD8DBQFA0M9/FRMICSmD1gYRAg4lAJ4ufbR7mvXRoCDdEL/s1CdoxH0SLACbBDxn
3KMTmrfYkj0mFvmkoevo3uA=
=jmiN
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--gary--1.0--patch-20 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-20
M  ChangeLog
M  libtoolize.in

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>

        * libtoolize.in (func_scan_files): Accept AC_WITH_LTDL as an
        indication that libltdl is being used.
        (Main): Without AC_CONFIG_MACRO_DIR, don't just dump all the
        macro files in `.' since they are never used, and aclocal will
        copy them from $aclocaldir into aclocal.m4 anyway.
        Reported by Alexandre Duret-Lutz <address@hidden>

--- orig/libtoolize.in
+++ mod/libtoolize.in
@@ -387,6 +387,7 @@
        /A[CM]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
        /LT_INIT/            { s,^.*$,seen_libtool=:,; p; };
        /AC_LIB_LTDL/        { s,^.*$,seen_ltdl=:,; p; };
+       /AC_WITH_LTDL/       { s,^.*$,seen_ltdl=:,; p; };
        d;'
     eval `cat aclocal.m4 "$configure_ac" 2>/dev/null | $SED "$my_sed_traces"`
 
@@ -446,9 +447,6 @@
         fi
       done
     fi
-
-    # Just use the current directory if all else fails.
-    test -n "$m4dir" || m4dir=.
 }
 
 # func_included_files searchfile
@@ -668,20 +666,23 @@
   func_ltmain_update "$pkgdatadir/ltmain.sh" "$auxdir/ltmain.sh"
 
   # Copy libtool's m4 macros to the macro directory, if they are newer.
-  $opt_quiet || if test "$m4dir" != .; then
-    func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
-  fi
+  if test -n "$m4dir"; then
+    libtool_m4="$aclocaldir/libtool.m4"
+    ltdl_m4="$aclocaldir/ltdl.m4"
 
-  libtool_m4="$aclocaldir/libtool.m4"
-  ltdl_m4="$aclocaldir/ltdl.m4"
+    $opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
 
-  func_copy_some_files "$aclocaldir" "$pkgmacro_files" "$m4dir" 
func_serial_update
-  func_serial_update  "$libtool_m4" "$m4dir/libtool.m4" LT_INIT 
'A[CM]_PROG_LIBTOOL'
+    func_serial_update  "$libtool_m4" "$m4dir/libtool.m4" \
+      LT_INIT 'A[CM]_PROG_LIBTOOL'
+
+    if $seen_ltdl; then
+      func_serial_update "$ltdl_m4" "$m4dir/ltdl.m4" 'AC_LIB_LTDL'
+    else
+      func_verbose "Not copying \`$ltdl_m4', libltdl not used."
+    fi
 
-  if $seen_ltdl; then
-    func_serial_update "$ltdl_m4" "$m4dir/ltdl.m4" 'AC_LIB_LTDL'
-  else
-    func_verbose "Not copying \`$ltdl_m4', AC_LIB_LTDL not used."
+    func_copy_some_files "$aclocaldir" "$pkgmacro_files" \
+      "$m4dir" func_serial_update
   fi
 }