Skip to content

Commit

Permalink
Fix AX_HAVE_QT
Browse files Browse the repository at this point in the history
The AX_HAVE_QT macro uses an uninitialized shell variable
am_have_qt_qmexe. Fix it.
  • Loading branch information
helmutg authored and bastien-roucaries committed Oct 1, 2022
1 parent da89908 commit a6c0e47
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions m4/ax_have_qt.m4
Expand Up @@ -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 ."`
Expand Down Expand Up @@ -119,7 +119,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_makefile
Expand Down

0 comments on commit a6c0e47

Please sign in to comment.