mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-10-22 10:46:04 +03:00
Fix configure script when running with dash
`test 1 == 1` will fail using dash as the default shell. The `test 1 = 1` syntax works in both Bash and Dash.
This commit is contained in:
parent
e8bec885cb
commit
5a3927a22d
2 changed files with 35 additions and 36 deletions
15
configure
vendored
15
configure
vendored
|
@ -4080,7 +4080,6 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
# Define --wth-* and --enable-* arguments
|
||||
|
||||
|
||||
|
@ -4137,7 +4136,7 @@ fi
|
|||
# Detect OS
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is FreeBSD" >&5
|
||||
$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 "yes" >&6; }
|
||||
LIBS="-lexecinfo $LIBS"
|
||||
|
@ -4267,7 +4266,7 @@ $as_echo "no" >&6; }
|
|||
PKG_CONFIG=""
|
||||
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
|
||||
fi
|
||||
|
||||
|
@ -4484,7 +4483,7 @@ fi
|
|||
$as_echo "$with_qt5" >&6; }
|
||||
as_fn_error $? "Unknown option \"$with_qt5\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
|
||||
esac
|
||||
if test "x$QT_QMAKE" == "x"; then :
|
||||
if test "x$QT_QMAKE" = "x"; then :
|
||||
as_fn_error $? "Could not find qmake" "$LINENO" 5
|
||||
|
||||
fi
|
||||
|
@ -4533,7 +4532,7 @@ 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
|
||||
else
|
||||
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
|
||||
# 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
|
||||
else
|
||||
{ $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.
|
||||
# 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
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Boost.System LIB: $BOOST_SYSTEM_LIB" >&5
|
||||
|
@ -6704,7 +6703,7 @@ $QT_QMAKE $CONFDIR/qbittorrent.pro
|
|||
ret="$?"
|
||||
|
||||
$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: Good, your configure finished." >&6;}
|
||||
else
|
||||
|
|
14
configure.ac
14
configure.ac
|
@ -49,14 +49,14 @@ AC_ARG_ENABLE(qt-dbus,
|
|||
|
||||
# Detect OS
|
||||
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])
|
||||
LIBS="-lexecinfo $LIBS"],
|
||||
[AC_MSG_RESULT([no])])
|
||||
|
||||
# Require 0.26 pkg-config
|
||||
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])])
|
||||
|
||||
# Check which arguments were set and act accordingly
|
||||
|
@ -96,7 +96,7 @@ AS_CASE(["x$with_qt5"],
|
|||
FIND_QT5()],
|
||||
[AC_MSG_RESULT([$with_qt5])
|
||||
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])
|
||||
])
|
||||
|
||||
|
@ -105,7 +105,7 @@ AS_CASE(["x$enable_qt_dbus"],
|
|||
["xyes"],
|
||||
[AC_MSG_RESULT([yes])
|
||||
FIND_QTDBUS()
|
||||
AS_IF([test "x$HAVE_QTDBUS" == "xfalse"],
|
||||
AS_IF([test "x$HAVE_QTDBUS" = "xfalse"],
|
||||
[AC_MSG_ERROR([Could not find QtDBus])],
|
||||
[QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus"]
|
||||
)],
|
||||
|
@ -119,7 +119,7 @@ AS_CASE(["x$enable_qt_dbus"],
|
|||
AX_BOOST_BASE([1.35])
|
||||
# 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.
|
||||
AS_IF([test "x$BOOST_CPPFLAGS" == "x"],
|
||||
AS_IF([test "x$BOOST_CPPFLAGS" = "x"],
|
||||
[AC_MSG_ERROR([Could not find Boost])],
|
||||
[AC_MSG_NOTICE([Boost CPPFLGAS: $BOOST_CPPFLAGS])
|
||||
CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
|
||||
|
@ -128,7 +128,7 @@ AS_IF([test "x$BOOST_CPPFLAGS" == "x"],
|
|||
AX_BOOST_SYSTEM()
|
||||
# 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.
|
||||
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_NOTICE([Boost.System LIB: $BOOST_SYSTEM_LIB])
|
||||
LIBS="$BOOST_SYSTEM_LIB $LIBS"])
|
||||
|
@ -190,7 +190,7 @@ $QT_QMAKE [$CONFDIR]/qbittorrent.pro
|
|||
ret="$?"
|
||||
|
||||
AS_ECHO()
|
||||
AS_IF([test "x$ret" == "x0"],
|
||||
AS_IF([test "x$ret" = "x0"],
|
||||
[AC_MSG_NOTICE([Good, your configure finished.])],
|
||||
[AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
|
||||
AS_ECHO()
|
||||
|
|
Loading…
Reference in a new issue