# HG changeset patch # User Markus Mützel # Date 1668954568 -3600 # Node ID 288a917d728ec8eadd76de4a1283c5d6b94df681 # Parent b05887fa873cf43d05fca4cee05d3ca61acc48f5# Parent 212e9ad58f69ef7b1f546ca625ffe6a24ab4bec6 maint: Merge stable to default. diff -r b05887fa873c -r 288a917d728e m4/acinclude.m4 --- a/m4/acinclude.m4 Sun Nov 20 11:08:04 2022 +0100 +++ b/m4/acinclude.m4 Sun Nov 20 15:29:28 2022 +0100 @@ -2726,7 +2726,6 @@ dnl GXX dnl LDFLAGS dnl ac_cv_f77_compiler_gnu -dnl ac_top_build_prefix dnl canonical_host_type dnl have_msvc dnl @@ -2764,9 +2763,10 @@ SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" ;; *-*-darwin*) - DL_LDFLAGS="-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${ac_top_build_prefix}src/octave${EXEEXT} ${LDFLAGS}" - dnl Contains variables that are defined and undefined at this point, so use - dnl appropriate quoting to defer expansion of ${bindir} and ${version}. + dnl Contains variables that are defined and undefined at this point, + dnl so use appropriate quoting to defer expansion of + dnl ${abs_top_builddir}, ${bindir}, and ${version}. + DL_LDFLAGS='-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${abs_top_builddir}/src/octave'"${EXEEXT} ${LDFLAGS}" MKOCTFILE_DL_LDFLAGS='-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}" SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}" case $canonical_host_type in