Mercurial > octave

diff m4/acinclude.m4 @ 30447:8a341cf6773d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Fix possible typo in configure tests. * m4/acinclude.m4 (OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME, OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT, OCTAVE_CHECK_NEW_QHELPINDEXWIDGET_API): Fix possible typo in configure tests. The intention probably never was to override CXXFLAGS with CPPFLAGS.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 07 Dec 2021 15:58:53 +0100
parents a4061ae5ff79
children abb4823df535
line wrap: on
line diff
--- a/m4/acinclude.m4	Tue Dec 07 15:47:44 2021 +0100
+++ b/m4/acinclude.m4	Tue Dec 07 15:58:53 2021 +0100
@@ -491,7 +491,7 @@
     ac_octave_save_CPPFLAGS="$CPPFLAGS"
     ac_octave_save_CXXFLAGS="$CXXFLAGS"
     CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
-    CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
+    CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
         #include <QGuiApplication>
         ]], [[
@@ -556,7 +556,7 @@
     ac_octave_save_CPPFLAGS="$CPPFLAGS"
     ac_octave_save_CXXFLAGS="$CXXFLAGS"
     CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
-    CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
+    CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
         #include <QHelpSearchQueryWidget>
         #include <QString>
@@ -1572,7 +1572,7 @@
     ac_octave_save_CPPFLAGS="$CPPFLAGS"
     ac_octave_save_CXXFLAGS="$CXXFLAGS"
     CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
-    CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
+    CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
         #include <QHelpLink>
         ]], [[