Merge pull request #5849 from yezezey/macOSconfigure

Add --disable-qt-dbus to configure if $host_os is macOS
This commit is contained in:
sledgehammer999 2016-11-07 00:16:11 +02:00 committed by GitHub
commit d5385523ac
2 changed files with 17 additions and 0 deletions

11
configure vendored
View File

@ -4257,6 +4257,17 @@ else
$as_echo "no" >&6; } $as_echo "no" >&6; }
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is macOS" >&5
$as_echo_n "checking whether OS is macOS... " >&6; }
if expr "$host_os" : ".*darwin.*" > /dev/null; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
enable_qt_dbus=no
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Require 0.23 pkg-config # Require 0.23 pkg-config

View File

@ -67,6 +67,12 @@ AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null],
LIBS="-lexecinfo $LIBS"], LIBS="-lexecinfo $LIBS"],
[AC_MSG_RESULT([no])]) [AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether OS is macOS])
AS_IF([expr "$host_os" : ".*darwin.*" > /dev/null],
[AC_MSG_RESULT([yes])
enable_qt_dbus=no],
[AC_MSG_RESULT([no])])
# Require 0.23 pkg-config # Require 0.23 pkg-config
PKG_PROG_PKG_CONFIG([0.23]) PKG_PROG_PKG_CONFIG([0.23])
AS_IF([test "x$PKG_CONFIG" = "x"], AS_IF([test "x$PKG_CONFIG" = "x"],