mirror of
https://github.com/hexchat/hexchat.git
synced 2024-11-10 05:02:50 +01:00
Fix dbus-libproxy confusion causing compilation to fail with dbus disabled and libproxy present
This commit is contained in:
parent
cb2f9f3e7b
commit
a251934b36
@ -465,6 +465,8 @@ PKG_CHECK_MODULES([LIBPROXY], [libproxy-1.0], [libproxy=yes], [
|
||||
libproxy=no
|
||||
])
|
||||
if test "x$libproxy" = "xyes" ; then
|
||||
COMMON_LIBS="$COMMON_LIBS $LIBPROXY_LIBS"
|
||||
COMMON_CFLAGS="$COMMON_CFLAGS $LIBPROXY_CFLAGS"
|
||||
AC_DEFINE(USE_LIBPROXY)
|
||||
fi
|
||||
|
||||
@ -585,7 +587,7 @@ if test "x$dbus" = "xyes" ; then
|
||||
if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$GLIB_GENMARSHAL" = "xno" || test "x$dbus" = "xno" ; then
|
||||
dbus="no"
|
||||
else
|
||||
COMMON_LIBS="$COMMON_LIBS $DBUS_LIBS $LIBPROXY_LIBS"
|
||||
COMMON_LIBS="$COMMON_LIBS $DBUS_LIBS"
|
||||
COMMON_CFLAGS="$COMMON_CFLAGS $DBUS_CFLAGS"
|
||||
AC_DEFINE(USE_DBUS)
|
||||
AS_AC_EXPAND(DATADIR, $datadir)
|
||||
|
Loading…
Reference in New Issue
Block a user