summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Untz <vuntz@novell.com>2010-02-16 21:30:32 +0100
committerVincent Untz <vuntz@novell.com>2010-02-16 21:30:32 +0100
commit2e06c3ba13e6dc5df66e19de8a80f30e27136936 (patch)
tree7487ec9cc52cffe45df98410e97c1087e77f25e0
parenta5f90bee60990c6e8c06dc57c10bc37488add006 (diff)
Remove gtk+/gio dependency
GTK+ was only needed for a test, and really, it didn't need it. And gio wasn't needed.
-rw-r--r--configure.ac4
-rw-r--r--src/test-cups-pk.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index f1e35e2..3b81557 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,12 +43,10 @@ fi
GLIB_REQUIRED=2.14.0
DBUS_REQUIRED=1.1.2
DBUS_GLIB_REQUIRED=0.74
-GTK_REQUIRED=2.12.0
POLKIT_REQUIRED=0.92
# pkg-config dependency checks
PKG_CHECK_MODULES(CUPS_PK, glib-2.0 >= $GLIB_REQUIRED \
- gio-2.0 \
gobject-2.0 \
gthread-2.0 \
dbus-1 >= $DBUS_REQUIRED \
@@ -57,7 +55,7 @@ PKG_CHECK_MODULES(CUPS_PK, glib-2.0 >= $GLIB_REQUIRED \
AC_SUBST(CUPS_PK_CFLAGS)
AC_SUBST(CUPS_PK_LIBS)
-PKG_CHECK_MODULES(CUPS_PK_GNOME, gtk+-2.0 >= $GTK_REQUIRED \
+PKG_CHECK_MODULES(CUPS_PK_GNOME, glib-2.0 >= $GLIB_REQUIRED \
dbus-1 >= $DBUS_REQUIRED \
dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
AC_SUBST(CUPS_PK_GNOME_CFLAGS)
diff --git a/src/test-cups-pk.c b/src/test-cups-pk.c
index ea895a1..faebc0b 100644
--- a/src/test-cups-pk.c
+++ b/src/test-cups-pk.c
@@ -22,8 +22,6 @@
*/
-#include <gtk/gtk.h>
-
#include <glib.h>
#include <dbus/dbus-glib.h>
@@ -81,7 +79,7 @@ main (int argc, char **argv)
gboolean ret;
GError *error;
- gtk_init (&argc, &argv);
+ g_type_init ();
error = NULL;
system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);