squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-23 16:58:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4631 from DoctorWho11/master

Browse Source 
fixes qmake pathing and also fixes a type in configure.ac
This commit is contained in:
sledgehammer999
2017-02-06 23:06:49 +02:00
committed by GitHub
parent f6a941defc f975187e48
commit 32b7f0745f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
m4/qbittorrent.m4
View File

@@ -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([test -f "$QT_QMAKE/qmake"],
[QT_QMAKE="$QT_QMAKE/qmake"],
[AC_CHECK_FILE([$QT_QMAKE/qmake-qt5],
[AS_IF([test -f "$QT_QMAKE/qmake-qt5"]
[QT_QMAKE="$QT_QMAKE/qmake-qt5"],
[QT_QMAKE=""])
])