mirror of
https://github.com/qbittorrent/qBittorrent
synced 2024-09-07 10:40:07 +02:00
fixes qmake pathing and also fixes a type in configure.ac
This commit is contained in:
parent
1af8a1533e
commit
8f875962b2
@ -156,7 +156,7 @@ AX_BOOST_BASE([1.35])
|
|||||||
# how to test for a set vs unset variable.
|
# how to test for a set vs unset variable.
|
||||||
AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
|
AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
|
||||||
[AC_MSG_ERROR([Could not find Boost])],
|
[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"
|
CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
|
||||||
LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
|
LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"])
|
||||||
|
|
||||||
|
@ -12,9 +12,9 @@ AC_DEFUN([FIND_QT4],
|
|||||||
[QT_QMAKE=`AS_DIRNAME(["$QT_QMAKE"])`])
|
[QT_QMAKE=`AS_DIRNAME(["$QT_QMAKE"])`])
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_CHECK_FILE([$QT_QMAKE/qmake],
|
AS_IF([$QT_QMAKE/qmake],
|
||||||
[QT_QMAKE="$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="$QT_QMAKE/qmake-qt4"],
|
||||||
[QT_QMAKE=""])
|
[QT_QMAKE=""])
|
||||||
])
|
])
|
||||||
@ -36,9 +36,9 @@ AC_DEFUN([FIND_QT5],
|
|||||||
[host_bins])
|
[host_bins])
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_CHECK_FILE([$QT_QMAKE/qmake],
|
AS_IF([$QT_QMAKE/qmake],
|
||||||
[QT_QMAKE="$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="$QT_QMAKE/qmake-qt5"],
|
||||||
[QT_QMAKE=""])
|
[QT_QMAKE=""])
|
||||||
])
|
])
|
||||||
|
Loading…
Reference in New Issue
Block a user