diff options
| author | Peter Simons <simons@cryp.to> | 2023-02-20 17:55:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 17:55:13 +0100 |
| commit | eb2152f472acbaa4c1990c5def48725f7ae9822a (patch) | |
| tree | 5cbe004f4465f421ba43a05378b3f8af908837df | |
| parent | 57c4b34f845a69045b0abd8a46fd62f9eaea9311 (diff) | |
| parent | a6c0e47e237215228d4af0abfbd18cf2ad8b3fd7 (diff) | |
| download | autoconf-archive-eb2152f472acbaa4c1990c5def48725f7ae9822a.tar.gz | |
Merge pull request #262 from bastien-roucaries/fromdebian20200930
Fix AX_HAVE_QT
| -rw-r--r-- | m4/ax_have_qt.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/ax_have_qt.m4 b/m4/ax_have_qt.m4 index 0f15650..019b649 100644 --- a/m4/ax_have_qt.m4 +++ b/m4/ax_have_qt.m4 @@ -64,13 +64,13 @@ AC_DEFUN([AX_HAVE_QT], AC_REQUIRE([AC_PATH_X]) AC_REQUIRE([AC_PATH_XTRA]) # openSUSE leap 15.3 installs qmake-qt5, not qmake, for example. - # Store the full name (like qmake-qt5) into am_have_qt_qmexe + # Store the full name (like qmake-qt5) into QMAKE # and the specifier (like -qt5 or empty) into am_have_qt_qmexe_suff. AC_ARG_VAR([QMAKE],"Qt make tool") AC_CHECK_TOOLS([QMAKE],[qmake qmake-qt6 qmake-qt5],[false]) AC_MSG_CHECKING(for Qt) - am_have_qt_qmexe_suff=`echo $am_have_qt_qmexe | sed 's,^.*qmake,,'` + am_have_qt_qmexe_suff=`echo $QMAKE | sed 's,^.*qmake,,'` # If we have Qt5 or later in the path, we're golden ver=`$QMAKE --version | grep -o "Qt version ."` @@ -120,7 +120,7 @@ percent.target = % percent.commands = @echo -n "\$(\$(@))\ " QMAKE_EXTRA_TARGETS += percent EOF - $am_have_qt_qmexe $am_have_qt_pro -o $am_have_qt_makefile + $QMAKE $am_have_qt_pro -o $am_have_qt_makefile QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS INCPATH` QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile LIBS` rm $am_have_qt_pro $am_have_qt_stash $am_have_qt_makefile |