From 8c0ea7bcb4409aaf8c96ad641f2db30003228ad0 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 24 Jun 2012 13:20:56 -0400 Subject: [PATCH] Disable introspection again Until I figure out the build issues. Sigh... --- configure.ac | 2 +- src/Makefile.am | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index fc930e907..2eebc7926 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ m4_define([hb_libtool_current], HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age AC_SUBST(HB_LIBTOOL_VERSION_INFO) -GOBJECT_INTROSPECTION_CHECK([0.9.0]) +dnl GOBJECT_INTROSPECTION_CHECK([0.9.0]) dnl GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) # Functions and headers diff --git a/src/Makefile.am b/src/Makefile.am index 2326b409e..f7cf5939b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -209,26 +209,26 @@ TESTS_ENVIRONMENT = \ HBHEADERS="$(HBHEADERS)" \ $(NULL) --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = hb-1.0.gir -INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_ -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - -if HAVE_INTROSPECTION - -hb-1.0.gir: libharfbuzz.la -hb_1_0_gir_INCLUDES = GObject-2.0 -hb_1_0_gir_CFLAGS = $(INCLUDES) $(HBCFLAGS) -DHB_H -DHB_H_IN -DHB_OT_H -DHB_OT_H_IN -hb_1_0_gir_LIBS = libharfbuzz.la -hb_1_0_gir_FILES = $(HBHEADERS) - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelib_DATA) -endif +#-include $(INTROSPECTION_MAKEFILE) +#INTROSPECTION_GIRS = hb-1.0.gir +#INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_ +#INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) +# +#if HAVE_INTROSPECTION +# +#hb-1.0.gir: libharfbuzz.la +#hb_1_0_gir_INCLUDES = GObject-2.0 +#hb_1_0_gir_CFLAGS = $(INCLUDES) $(HBCFLAGS) -DHB_H -DHB_H_IN -DHB_OT_H -DHB_OT_H_IN +#hb_1_0_gir_LIBS = libharfbuzz.la +#hb_1_0_gir_FILES = $(HBHEADERS) +# +#girdir = $(datadir)/gir-1.0 +#gir_DATA = $(INTROSPECTION_GIRS) +# +#typelibdir = $(libdir)/girepository-1.0 +#typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +# +#CLEANFILES += $(gir_DATA) $(typelib_DATA) +#endif -include $(top_srcdir)/git.mk