From 8f875962b228b4d772202b651422e44c55add5be Mon Sep 17 00:00:00 2001 From: Zach Bacon <11doctorwhocanada@gmail.com> Date: Wed, 20 Jan 2016 12:47:53 -0500 Subject: [PATCH] fixes qmake pathing and also fixes a type in configure.ac --- configure.ac | 2 +- m4/qbittorrent.m4 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 172072b5f..1f9c91d0d 100644 --- a/configure.ac +++ b/configure.ac @@ -156,7 +156,7 @@ AX_BOOST_BASE([1.35]) # how to test for a set vs unset variable. AS_IF([test "x$BOOST_CPPFLAGS" = "x"], [AC_MSG_ERROR([Could not find Boost])], - [AC_MSG_NOTICE([Boost CPPFLGAS: $BOOST_CPPFLAGS]) + [AC_MSG_NOTICE([Boost CPPFLAGS: $BOOST_CPPFLAGS]) CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"]) diff --git a/m4/qbittorrent.m4 b/m4/qbittorrent.m4 index e104c443a..9e9fc0f2e 100644 --- a/m4/qbittorrent.m4 +++ b/m4/qbittorrent.m4 @@ -12,9 +12,9 @@ AC_DEFUN([FIND_QT4], [QT_QMAKE=`AS_DIRNAME(["$QT_QMAKE"])`]) ]) -AC_CHECK_FILE([$QT_QMAKE/qmake], +AS_IF([$QT_QMAKE/qmake], [QT_QMAKE="$QT_QMAKE/qmake"], - [AC_CHECK_FILE([$QT_QMAKE/qmake-qt4], + [AS_IF([$QT_QMAKE/qmake-qt4], [QT_QMAKE="$QT_QMAKE/qmake-qt4"], [QT_QMAKE=""]) ]) @@ -36,9 +36,9 @@ AC_DEFUN([FIND_QT5], [host_bins]) ]) -AC_CHECK_FILE([$QT_QMAKE/qmake], +AS_IF([$QT_QMAKE/qmake], [QT_QMAKE="$QT_QMAKE/qmake"], - [AC_CHECK_FILE([$QT_QMAKE/qmake-qt5], + [AS_IF([$QT_QMAKE/qmake-qt5], [QT_QMAKE="$QT_QMAKE/qmake-qt5"], [QT_QMAKE=""]) ])