mirror/libtool
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/libtool.git synced 2026-01-26 15:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

* libtoolize.in (func_scan_files): Accept AC_WITH_LTDL as an

Browse Source 
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 <adl@gnu.org>
This commit is contained in:
Gary V. Vaughan 2004-06-17 08:03:49 +00:00
parent aa6cd3e074
commit cab5f352d5
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2004-06-17 Gary V. Vaughan <gary@gnu.org>
* 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 <adl@gnu.org>
2004-06-16 Brad <brad@comstyle.com>
* m4/libtool.m4: More improvements to OpenBSD support.

29
libtoolize.in
View File

@ -387,6 +387,7 @@ func_scan_files ()
/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 @@ func_scan_files ()
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_config_update ()
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', AC_LIB_LTDL not used."
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
func_copy_some_files "$aclocaldir" "$pkgmacro_files" \
"$m4dir" func_serial_update
fi
}