summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2010-12-21 12:34:32 -0500
committerRyan Lortie <desrt@desrt.ca>2010-12-21 12:34:32 -0500
commit06157a3319ebae6b64270987282f262803672f12 (patch)
tree685d7cb302af5e39f913bd8d1edb7c5f9f427a43
parent84e604044d662c3c351a0c777d994d0626526d09 (diff)
downloaddconf-06157a3319ebae6b64270987282f262803672f12.tar.gz
Disable gobject-introspection support
It's not usable for libdconf anyway (due to lack of GVariant support in the bindings) and it keeps causing build problems.
-rw-r--r--client/Makefile.am20
-rw-r--r--configure.ac3
2 files changed, 1 insertions, 22 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index 358c078..0459808 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,21 +1,3 @@
-if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
-
-dconf-1.0.gir: libdconf.so.0 libdconf.so
-dconf_1_0_gir_INCLUDES = Gio-2.0
-dconf_1_0_gir_CFLAGS = $(INCLUDES)
-dconf_1_0_gir_LIBS = dconf
-dconf_1_0_gir_FILES = dconf-client.c dconf-client.h
-dconf_1_0_gir_SCANNERFLAGS = --no-libtool --identifier-prefix=DConf
-INTROSPECTION_GIRS = dconf-1.0.gir
-
-girdir = $(datadir)/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-endif
-
AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -D__dconf_h__ -fPIC -DPIC
CFLAGS += -Wno-error
INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
@@ -60,4 +42,4 @@ vapidir = $(datadir)/vala/vapi
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dconf.pc
-CLEANFILES = $(dist_gir_DATA) $(typelib_DATA) dconf.deps libdconf.so.0 libdconf.so
+CLEANFILES = $(typelib_DATA) dconf.deps libdconf.so.0 libdconf.so
diff --git a/configure.ac b/configure.ac
index 309e2da..174d4a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,9 +14,6 @@ AM_SILENT_RULES([yes])
AC_PROG_CC
AM_PROG_VALAC([0.9.5])
-# Introspection
-GOBJECT_INTROSPECTION_CHECK([0.9.5])
-
# Gtk-doc support
GTK_DOC_CHECK([1.15])