From a251934b36d399f9c717166fdf0be89ffda810ec Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Wed, 18 Jul 2012 21:19:11 +0200 Subject: Fix dbus-libproxy confusion causing compilation to fail with dbus disabled and libproxy present --- configure.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index c8b21be6..3b6b448a 100644 --- a/configure.in +++ b/configure.in @@ -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) -- cgit 1.4.1