moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix dbus-libproxy confusion causing compilation to fail with dbus disabled and libproxy present

This commit is contained in:
Berke Viktor 2012-07-18 21:19:11 +02:00
parent cb2f9f3e7b
commit a251934b36
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -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)