d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #2156 from jleclanche/master 

Fix configure script when running with dash
adaptive-webui-19844
sledgehammer999 10 years ago
parent
e8bec885cb 5a3927a22d
commit
150a401632
2 changed files with 35 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      configure
  2. 14
      configure.ac

15
configure vendored
Unescape View File

@ -4080,7 +4080,6 @@ fi
# Define --wth-* and --enable-* arguments # Define --wth-* and --enable-* arguments
@ -4137,7 +4136,7 @@ fi
# Detect OS # Detect OS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is FreeBSD" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is FreeBSD" >&5
$as_echo_n "checking whether OS is FreeBSD... " >&6; } $as_echo_n "checking whether OS is FreeBSD... " >&6; }
if test "x$host_os" == "x*freebsd*"; then : if test "x$host_os" = "x*freebsd*"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
LIBS="-lexecinfo $LIBS" LIBS="-lexecinfo $LIBS"
@ -4267,7 +4266,7 @@ $as_echo "no" >&6; }
PKG_CONFIG="" PKG_CONFIG=""
fi fi
fi fi
if test "x$PKG_CONFIG" == "x"; then : if test "x$PKG_CONFIG" = "x"; then :
as_fn_error $? "Could not find pkg-config" "$LINENO" 5 as_fn_error $? "Could not find pkg-config" "$LINENO" 5
fi fi
@ -4484,7 +4483,7 @@ fi
$as_echo "$with_qt5" >&6; } $as_echo "$with_qt5" >&6; }
as_fn_error $? "Unknown option \"$with_qt5\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;; as_fn_error $? "Unknown option \"$with_qt5\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
esac esac
if test "x$QT_QMAKE" == "x"; then : if test "x$QT_QMAKE" = "x"; then :
as_fn_error $? "Could not find qmake" "$LINENO" 5 as_fn_error $? "Could not find qmake" "$LINENO" 5
fi fi
@ -4533,7 +4532,7 @@ fi
fi fi
if test "x$HAVE_QTDBUS" == "xfalse"; then : if test "x$HAVE_QTDBUS" = "xfalse"; then :
as_fn_error $? "Could not find QtDBus" "$LINENO" 5 as_fn_error $? "Could not find QtDBus" "$LINENO" 5
else else
QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus" QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus"
@ -4829,7 +4828,7 @@ fi
# HAVE_BOOST is set to an empty value when Boost is found. I don't know # HAVE_BOOST is set to an empty value when Boost is found. I don't know
# how to test for a set vs unset variable. # how to test for a set vs unset variable.
if test "x$BOOST_CPPFLAGS" == "x"; then : if test "x$BOOST_CPPFLAGS" = "x"; then :
as_fn_error $? "Could not find Boost" "$LINENO" 5 as_fn_error $? "Could not find Boost" "$LINENO" 5
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: Boost CPPFLGAS: $BOOST_CPPFLAGS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Boost CPPFLGAS: $BOOST_CPPFLAGS" >&5
@ -5081,7 +5080,7 @@ fi
# HAVE_BOOST_SYSTEM is set to an empty value when Boost.System is found. # HAVE_BOOST_SYSTEM is set to an empty value when Boost.System is found.
# I don't know how to test for a set vs unset variable. # I don't know how to test for a set vs unset variable.
if test "x$BOOST_SYSTEM_LIB" == "x"; then : if test "x$BOOST_SYSTEM_LIB" = "x"; then :
as_fn_error $? "Could not find Boost.System" "$LINENO" 5 as_fn_error $? "Could not find Boost.System" "$LINENO" 5
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: Boost.System LIB: $BOOST_SYSTEM_LIB" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Boost.System LIB: $BOOST_SYSTEM_LIB" >&5
@ -6704,7 +6703,7 @@ $QT_QMAKE $CONFDIR/qbittorrent.pro
ret="$?" ret="$?"
$as_echo $as_echo
if test "x$ret" == "x0"; then : if test "x$ret" = "x0"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: Good, your configure finished." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Good, your configure finished." >&5
$as_echo "$as_me: Good, your configure finished." >&6;} $as_echo "$as_me: Good, your configure finished." >&6;}
else else

14
configure.ac
Unescape View File

@ -49,14 +49,14 @@ AC_ARG_ENABLE(qt-dbus,
# Detect OS # Detect OS
AC_MSG_CHECKING([whether OS is FreeBSD]) AC_MSG_CHECKING([whether OS is FreeBSD])
AS_IF([test "x$host_os" == "x*freebsd*"], AS_IF([test "x$host_os" = "x*freebsd*"],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
LIBS="-lexecinfo $LIBS"], LIBS="-lexecinfo $LIBS"],
[AC_MSG_RESULT([no])]) [AC_MSG_RESULT([no])])
# Require 0.26 pkg-config # Require 0.26 pkg-config
PKG_PROG_PKG_CONFIG([0.26]) PKG_PROG_PKG_CONFIG([0.26])
AS_IF([test "x$PKG_CONFIG" == "x"], AS_IF([test "x$PKG_CONFIG" = "x"],
[AC_MSG_ERROR([Could not find pkg-config])]) [AC_MSG_ERROR([Could not find pkg-config])])
# Check which arguments were set and act accordingly # Check which arguments were set and act accordingly
@ -96,7 +96,7 @@ AS_CASE(["x$with_qt5"],
FIND_QT5()], FIND_QT5()],
[AC_MSG_RESULT([$with_qt5]) [AC_MSG_RESULT([$with_qt5])
AC_MSG_ERROR([Unknown option "$with_qt5". Use either "yes" or "no".])]) AC_MSG_ERROR([Unknown option "$with_qt5". Use either "yes" or "no".])])
AS_IF([test "x$QT_QMAKE" == "x"], AS_IF([test "x$QT_QMAKE" = "x"],
[AC_MSG_ERROR([Could not find qmake]) [AC_MSG_ERROR([Could not find qmake])
]) ])
@ -105,7 +105,7 @@ AS_CASE(["x$enable_qt_dbus"],
["xyes"], ["xyes"],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
FIND_QTDBUS() FIND_QTDBUS()
AS_IF([test "x$HAVE_QTDBUS" == "xfalse"], AS_IF([test "x$HAVE_QTDBUS" = "xfalse"],
[AC_MSG_ERROR([Could not find QtDBus])], [AC_MSG_ERROR([Could not find QtDBus])],
[QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus"] [QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus"]
)], )],
@ -119,7 +119,7 @@ AS_CASE(["x$enable_qt_dbus"],
AX_BOOST_BASE([1.35]) AX_BOOST_BASE([1.35])
# HAVE_BOOST is set to an empty value when Boost is found. I don't know # HAVE_BOOST is set to an empty value when Boost is found. I don't know
# 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 CPPFLGAS: $BOOST_CPPFLAGS])
CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
@ -128,7 +128,7 @@ AS_IF([test "x$BOOST_CPPFLAGS" == "x"],
AX_BOOST_SYSTEM() AX_BOOST_SYSTEM()
# HAVE_BOOST_SYSTEM is set to an empty value when Boost.System is found. # HAVE_BOOST_SYSTEM is set to an empty value when Boost.System is found.
# I don't know how to test for a set vs unset variable. # I don't know how to test for a set vs unset variable.
AS_IF([test "x$BOOST_SYSTEM_LIB" == "x"], AS_IF([test "x$BOOST_SYSTEM_LIB" = "x"],
[AC_MSG_ERROR([Could not find Boost.System])], [AC_MSG_ERROR([Could not find Boost.System])],
[AC_MSG_NOTICE([Boost.System LIB: $BOOST_SYSTEM_LIB]) [AC_MSG_NOTICE([Boost.System LIB: $BOOST_SYSTEM_LIB])
LIBS="$BOOST_SYSTEM_LIB $LIBS"]) LIBS="$BOOST_SYSTEM_LIB $LIBS"])
@ -190,7 +190,7 @@ $QT_QMAKE [$CONFDIR]/qbittorrent.pro
ret="$?" ret="$?"
AS_ECHO() AS_ECHO()
AS_IF([test "x$ret" == "x0"], AS_IF([test "x$ret" = "x0"],
[AC_MSG_NOTICE([Good, your configure finished.])], [AC_MSG_NOTICE([Good, your configure finished.])],
[AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])]) [AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
AS_ECHO() AS_ECHO()

Write Preview
Loading…
Cancel
Save