Mercurial > octave

diff m4/acinclude.m4 @ 29663:5811df727e96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9e670ec38513
children 7f339da6cabd
line wrap: on
line diff
--- 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