29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
|
commit 7f9b3b55a28ae2c5c39913f6137064931406c381
|
||
|
|
Author: Bastien Nocera <hadess@hadess.net>
|
||
|
|
Date: Tue Dec 1 15:18:25 2009 +0000
|
||
|
|
|
||
|
|
Fix dbus-glib-1 check in configure
|
||
|
|
|
||
|
|
DBUS_CFLAGS and DBUS_LIBS were never set through AC_SUBST. Clean
|
||
|
|
up the check using PKG_CHECK_MODULES instead.
|
||
|
|
|
||
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=603492
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index a7d31d9..9f48de0 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -96,10 +96,9 @@ AC_ARG_ENABLE(packagekit,
|
||
|
|
[AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],,
|
||
|
|
[enable_packagekit=yes])
|
||
|
|
if test "x$enable_packagekit" != "xno"; then
|
||
|
|
- if pkg-config dbus-glib-1; then
|
||
|
|
+ PKG_CHECK_MODULES(DBUS, dbus-glib-1, has_dbus_glib=yes, has_dbug_glib=no)
|
||
|
|
+ if test "x$has_dbus_glib" = "xyes"; then
|
||
|
|
AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer])
|
||
|
|
- DBUS_CFLAGS = `pkg-config --cflags dbus-glib-1`
|
||
|
|
- DBUS_LIBS = `pkg-config --libs dbus-glib-1`
|
||
|
|
else
|
||
|
|
enable_packagekit=no
|
||
|
|
fi
|