Mercurial > octave
changeset 29663:5811df727e96
build: Don't try to expand Makefile variable in configure script.
* m4/acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Update value of "link_all_deps".
* configure.ac: Check value of "link_all_deps".
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Thu, 13 May 2021 19:05:29 +0200 |
| parents | 5ad070a5f19a |
| children | 5f37ef6e7114 |
| files | configure.ac m4/acinclude.m4 |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu May 13 18:06:23 2021 +0200 +++ b/configure.ac Thu May 13 19:05:29 2021 +0200 @@ -2964,7 +2964,7 @@ OCT_LINK_OPTS="$LDFLAGS" OCT_GUI_LINK_OPTS="$LDFLAGS" -if test $AMCOND_LINK_ALL_DEPS = yes; then +if test $link_all_deps = yes; then AC_DEFINE(OCTAVE_LINK_ALL_DEPS, 1, [Link with all dependencies.]) OCT_LINK_DEPS="libinterp/liboctinterp.la liboctave/liboctave.la"
--- a/m4/acinclude.m4 Thu May 13 18:06:23 2021 +0200 +++ b/m4/acinclude.m4 Thu May 13 19:05:29 2021 +0200 @@ -2082,8 +2082,10 @@ QT_OPENGL_LIBS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" ## Enabling link_all_deps works around libtool's imperfect handling ## of the -F flag - AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], - [test $link_all_deps = yes || test -n "$QT_LDFLAGS"]) + if test -n "$QT_LDFLAGS"; then + link_all_deps=yes + fi + AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes]) fi ;; esac