github/qBittorrent
1
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2024-10-05 18:01:15 +02:00
Code Releases Activity

Make configure detect qmake with different names. Closes #1924.

Browse Source
This commit is contained in:
sledgehammer999 2014-11-23 20:24:57 +02:00
parent 3008d12c3c
commit 950574c4c5
2 changed files with 77 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
configure vendored
View File

@ -4440,16 +4440,22 @@ $as_echo X"$QT_QMAKE" |
s//\1/ s//\1/
q q
} }
s/.*/./; q'`/qmake s/.*/./; q'`
as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE" | $as_tr_sh` fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE" >&5
$as_echo_n "checking for $QT_QMAKE... " >&6; } fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 qmake >= 4.8.0" >&5
$as_echo_n "checking for Qt4 qmake >= 4.8.0... " >&6; }
as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake" >&5
$as_echo_n "checking for $QT_QMAKE/qmake... " >&6; }
if eval \${$as_ac_File+:} false; then : if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
test "$cross_compiling" = yes && test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "$QT_QMAKE"; then if test -r "$QT_QMAKE/qmake"; then
eval "$as_ac_File=yes" eval "$as_ac_File=yes"
else else
eval "$as_ac_File=no" eval "$as_ac_File=no"
@ -4459,7 +4465,27 @@ eval ac_res=\$$as_ac_File
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; } $as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then : if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
QT_QMAKE="$QT_QMAKE/qmake"
else
as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake-qt4" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake-qt4" >&5
$as_echo_n "checking for $QT_QMAKE/qmake-qt4... " >&6; }
if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "$QT_QMAKE/qmake-qt4"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
fi
fi
eval ac_res=\$$as_ac_File
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
QT_QMAKE="$QT_QMAKE/qmake-qt4"
else else
QT_QMAKE="" QT_QMAKE=""
fi fi
@ -4467,10 +4493,6 @@ fi
fi fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 qmake >= 4.8.0" >&5
$as_echo_n "checking for Qt4 qmake >= 4.8.0... " >&6; }
if test "x$QT_QMAKE" != "x"; then : if test "x$QT_QMAKE" != "x"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_QMAKE" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_QMAKE" >&5
$as_echo "$QT_QMAKE" >&6; } $as_echo "$QT_QMAKE" >&6; }
@ -4513,15 +4535,21 @@ if test "x$QT_QMAKE" = x""; then :
else else
QT_QMAKE=$QT_QMAKE/qmake QT_QMAKE=$QT_QMAKE/qmake
as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE" | $as_tr_sh` fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE" >&5
$as_echo_n "checking for $QT_QMAKE... " >&6; } fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 qmake >= 5.2.0" >&5
$as_echo_n "checking for Qt5 qmake >= 5.2.0... " >&6; }
as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake" >&5
$as_echo_n "checking for $QT_QMAKE/qmake... " >&6; }
if eval \${$as_ac_File+:} false; then : if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
test "$cross_compiling" = yes && test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "$QT_QMAKE"; then if test -r "$QT_QMAKE/qmake"; then
eval "$as_ac_File=yes" eval "$as_ac_File=yes"
else else
eval "$as_ac_File=no" eval "$as_ac_File=no"
@ -4531,7 +4559,27 @@ eval ac_res=\$$as_ac_File
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; } $as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then : if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
QT_QMAKE="$QT_QMAKE/qmake"
else
as_ac_File=`$as_echo "ac_cv_file_$QT_QMAKE/qmake-qt5" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $QT_QMAKE/qmake-qt5" >&5
$as_echo_n "checking for $QT_QMAKE/qmake-qt5... " >&6; }
if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "$QT_QMAKE/qmake-qt5"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
fi
fi
eval ac_res=\$$as_ac_File
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
QT_QMAKE="$QT_QMAKE/qmake-qt5"
else else
QT_QMAKE="" QT_QMAKE=""
fi fi
@ -4539,10 +4587,6 @@ fi
fi fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 qmake >= 5.2.0" >&5
$as_echo_n "checking for Qt5 qmake >= 5.2.0... " >&6; }
if test "x$QT_QMAKE" != "x"; then : if test "x$QT_QMAKE" != "x"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_QMAKE" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_QMAKE" >&5
$as_echo "$QT_QMAKE" >&6; } $as_echo "$QT_QMAKE" >&6; }

24
m4/qbittorrent.m4
View File

@ -9,14 +9,16 @@ AC_DEFUN([FIND_QT4],
[PKG_CHECK_VAR(QT_QMAKE, [PKG_CHECK_VAR(QT_QMAKE,
[QtCore >= 4.8.0], [QtCore >= 4.8.0],
[moc_location], [moc_location],
[QT_QMAKE=`AS_DIRNAME(["$QT_QMAKE"])`/qmake [QT_QMAKE=`AS_DIRNAME(["$QT_QMAKE"])`])
AC_CHECK_FILE([$QT_QMAKE],
[],
[QT_QMAKE=""])
])
]) ])
AC_MSG_CHECKING([for Qt4 qmake >= 4.8.0]) AC_MSG_CHECKING([for Qt4 qmake >= 4.8.0])
AC_CHECK_FILE([$QT_QMAKE/qmake],
[QT_QMAKE="$QT_QMAKE/qmake"],
[AC_CHECK_FILE([$QT_QMAKE/qmake-qt4],
[QT_QMAKE="$QT_QMAKE/qmake-qt4"],
[QT_QMAKE=""])
])
AS_IF([test "x$QT_QMAKE" != "x"], AS_IF([test "x$QT_QMAKE" != "x"],
[AC_MSG_RESULT([$QT_QMAKE])], [AC_MSG_RESULT([$QT_QMAKE])],
[AC_MSG_RESULT([not found])] [AC_MSG_RESULT([not found])]
@ -31,14 +33,16 @@ AC_DEFUN([FIND_QT5],
[PKG_CHECK_VAR(QT_QMAKE, [PKG_CHECK_VAR(QT_QMAKE,
[Qt5Core >= 5.2.0], [Qt5Core >= 5.2.0],
[host_bins], [host_bins],
[QT_QMAKE=[$QT_QMAKE]/qmake [QT_QMAKE=[$QT_QMAKE]/qmake])
AC_CHECK_FILE([$QT_QMAKE],
[],
[QT_QMAKE=""])
])
]) ])
AC_MSG_CHECKING([for Qt5 qmake >= 5.2.0]) AC_MSG_CHECKING([for Qt5 qmake >= 5.2.0])
AC_CHECK_FILE([$QT_QMAKE/qmake],
[QT_QMAKE="$QT_QMAKE/qmake"],
[AC_CHECK_FILE([$QT_QMAKE/qmake-qt5],
[QT_QMAKE="$QT_QMAKE/qmake-qt5"],
[QT_QMAKE=""])
])
AS_IF([test "x$QT_QMAKE" != "x"], AS_IF([test "x$QT_QMAKE" != "x"],
[AC_MSG_RESULT([$QT_QMAKE])], [AC_MSG_RESULT([$QT_QMAKE])],
[AC_MSG_RESULT([not found])] [AC_MSG_RESULT([not found])]