From cab5f352d5c05e667cfb703e733d4d2fb3795f85 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Thu, 17 Jun 2004 08:03:49 +0000 Subject: [PATCH] * 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 --- ChangeLog | 9 +++++++++ libtoolize.in | 29 +++++++++++++++-------------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 430c6fefa..103a30f2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-06-17 Gary V. Vaughan + + * 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 + 2004-06-16 Brad * m4/libtool.m4: More improvements to OpenBSD support. diff --git a/libtoolize.in b/libtoolize.in index a85af9356..cd6d6254f 100644 --- a/libtoolize.in +++ b/libtoolize.in @@ -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', 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 } -- 2.47.2