diff --git a/configure b/configure index b24512800..7e3b1794e 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ ac_user_opts=' enable_option_checking enable_dependency_tracking enable_silent_rules -with_qt5 +with_qt4 with_geoip_database_embedded with_qtsingleapplication enable_debug @@ -1377,7 +1377,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-qt5 Compile using Qt5 (default=no) + --with-qt4 Compile using Qt4 (default=no) --with-geoip-database-embedded Embed the GeoIP database in the qBittorrent executable (please follow instructions in @@ -1414,7 +1414,7 @@ Some influential environment variables: directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path - QT_QMAKE value of moc_location for QtCore >= 4.8.0, overriding pkg-config + QT_QMAKE value of host_bins for Qt5Core >= 5.2.0, overriding pkg-config zlib_CFLAGS C compiler flags for zlib, overriding pkg-config zlib_LIBS linker flags for zlib, overriding pkg-config libtorrent_CFLAGS @@ -4161,11 +4161,11 @@ fi # Define --wth-* and --enable-* arguments -# Check whether --with-qt5 was given. -if test "${with_qt5+set}" = set; then : - withval=$with_qt5; +# Check whether --with-qt4 was given. +if test "${with_qt4+set}" = set; then : + withval=$with_qt4; else - with_qt5=no + with_qt4=no fi @@ -4438,13 +4438,106 @@ $as_echo "$enable_webui" >&6; } as_fn_error $? "Unknown option \"$enable_webui\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt5 should be enabled" >&5 -$as_echo_n "checking whether Qt5 should be enabled... " >&6; } -case "x$with_qt5" in #( +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt4 should be enabled" >&5 +$as_echo_n "checking whether Qt4 should be enabled... " >&6; } +case "x$with_qt4" in #( "xno") : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + +if test -n "$QT_QMAKE"; then + pkg_cv_QT_QMAKE="$QT_QMAKE" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QT_QMAKE=`$PKG_CONFIG --variable="host_bins" "Qt5Core >= 5.2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +QT_QMAKE=$pkg_cv_QT_QMAKE + +if test "x$QT_QMAKE" = x""; then : + +fi + +fi + +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 : + $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"; 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" +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 + QT_QMAKE="" +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 : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_QMAKE" >&5 +$as_echo "$QT_QMAKE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +fi + ;; #( + "xyes") : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.8.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtCore >= 4.8.0") 2>&5 ac_status=$? @@ -4556,105 +4649,12 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } -fi - ;; #( - "xyes") : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - -if test -n "$QT_QMAKE"; then - pkg_cv_QT_QMAKE="$QT_QMAKE" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_QT_QMAKE=`$PKG_CONFIG --variable="host_bins" "Qt5Core >= 5.2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -QT_QMAKE=$pkg_cv_QT_QMAKE - -if test "x$QT_QMAKE" = x""; then : - -fi - -fi - -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 : - $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"; 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" -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 - QT_QMAKE="" -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 : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_QMAKE" >&5 -$as_echo "$QT_QMAKE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - fi ;; #( *) : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_qt5" >&5 -$as_echo "$with_qt5" >&6; } - as_fn_error $? "Unknown option \"$with_qt5\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_qt4" >&5 +$as_echo "$with_qt4" >&6; } + as_fn_error $? "Unknown option \"$with_qt4\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;; esac if test "x$QT_QMAKE" = "x"; then : as_fn_error $? "Could not find qmake" "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 35d449cf5..943c4a798 100644 --- a/configure.ac +++ b/configure.ac @@ -12,11 +12,11 @@ AM_INIT_AUTOMAKE # Define --wth-* and --enable-* arguments -AC_ARG_WITH(qt5, - [AS_HELP_STRING([--with-qt5], - [Compile using Qt5 (default=no)])], +AC_ARG_WITH(qt4, + [AS_HELP_STRING([--with-qt4], + [Compile using Qt4 (default=no)])], [], - [with_qt5=no]) + [with_qt4=no]) AC_ARG_WITH(geoip-database-embedded, [AS_HELP_STRING([--with-geoip-database-embedded], @@ -122,16 +122,16 @@ AS_CASE(["x$enable_webui"], [AC_MSG_RESULT([$enable_webui]) AC_MSG_ERROR([Unknown option "$enable_webui". Use either "yes" or "no".])]) -AC_MSG_CHECKING([whether Qt5 should be enabled]) -AS_CASE(["x$with_qt5"], +AC_MSG_CHECKING([whether Qt4 should be enabled]) +AS_CASE(["x$with_qt4"], ["xno"], [AC_MSG_RESULT([no]) - FIND_QT4()], + FIND_QT5()], ["xyes"], [AC_MSG_RESULT([yes]) - FIND_QT5()], - [AC_MSG_RESULT([$with_qt5]) - AC_MSG_ERROR([Unknown option "$with_qt5". Use either "yes" or "no".])]) + FIND_QT4()], + [AC_MSG_RESULT([$with_qt4]) + AC_MSG_ERROR([Unknown option "$with_qt4". Use either "yes" or "no".])]) AS_IF([test "x$QT_QMAKE" = "x"], [AC_MSG_ERROR([Could not find qmake]) ])