diff options
| author | Peter Simons <simons@cryp.to> | 2023-02-20 17:53:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 17:53:32 +0100 |
| commit | 9f0ebdd0da527119c7675890987407bfbc710404 (patch) | |
| tree | ae5dd28111085c5fcb9e5caadda3e6a92c9c8062 /m4 | |
| parent | 1160bbb7202d42b5ac2a06fc6fc55be171d13536 (diff) | |
| parent | 3165e4097068ef4490330e80bb7f927ce2c52e11 (diff) | |
| download | autoconf-archive-9f0ebdd0da527119c7675890987407bfbc710404.tar.gz | |
Merge pull request #266 from netfab/fix-ax_have_qt
AX_HAVE_QT: remove qmake stash file before rmdir
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ax_have_qt.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/m4/ax_have_qt.m4 b/m4/ax_have_qt.m4 index 407e9e9..0a12ccd 100644 --- a/m4/ax_have_qt.m4 +++ b/m4/ax_have_qt.m4 @@ -79,6 +79,7 @@ AC_DEFUN([AX_HAVE_QT], # This pro file dumps qmake's variables, but it only works on Qt 5 or later am_have_qt_dir=`mktemp -d` am_have_qt_pro="$am_have_qt_dir/test.pro" + am_have_qt_stash="$am_have_qt_dir/.qmake.stash" am_have_qt_makefile="$am_have_qt_dir/Makefile" # http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt cat > $am_have_qt_pro << EOF @@ -122,7 +123,7 @@ EOF $am_have_qt_qmexe $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 + rm $am_have_qt_pro $am_have_qt_stash $am_have_qt_makefile rmdir $am_have_qt_dir # Look for specific tools in $PATH |