[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
libtool--gary--1.0--patch-21
From: |
Gary V. Vaughan |
Subject: |
libtool--gary--1.0--patch-21 |
Date: |
Thu, 17 Jun 2004 09:03:17 +0100 (BST) |
User-agent: |
mailnotify/0.3 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
- --
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)
iD8DBQFA0VBFFRMICSmD1gYRAkeQAKDK0Nb5lD6Z0qtsy1xlPe7SF/5iKwCdEFOk
A88Gy3PruOYgqzO70hb2IE8=
=kXFr
-----END PGP SIGNATURE-----
* looking for address@hidden/libtool--devo--1.0--patch-66 to compare with
* comparing to address@hidden/libtool--devo--1.0--patch-66
A
{arch}/libtool/libtool--gary/libtool--gary--1.0/address@hidden/patch-log/patch-21
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
}
* added files
--- /dev/null
+++
/Users/gary/devel/savannah/libtool--devo--1.0/,,address@hidden/new-files-archive/./{arch}/libtool/libtool--gary/libtool--gary--1.0/address@hidden/patch-log/patch-21
@@ -0,0 +1,16 @@
+Revision: libtool--gary--1.0--patch-21
+Archive: address@hidden
+Creator: Gary V. Vaughan <address@hidden>
+Date: Wed Jun 16 23:51:13 BST 2004
+Standard-date: 2004-06-16 22:51:13 GMT
+Modified-files: ChangeLog libtoolize.in
+New-patches: address@hidden/libtool--gary--1.0--patch-21
+Summary: libtoolize only installs macros if AC_CONFIG_MACRO_DIR is seen
+Keywords:
+
+* 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>