From 16efbde01ada6869c41426af673550bb7ddbebf8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 10 May 2011 13:40:39 +0200 Subject: [PATCH] configure: reintroduce introspection flags to fix crosscompilation --- Makefile.am | 2 ++ configure.ac | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/Makefile.am b/Makefile.am index 63bd2bf3..651a1545 100644 --- a/Makefile.am +++ b/Makefile.am @@ -433,6 +433,7 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ +if ENABLE_INTROSPECTION extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \ LD_LIBRARY_PATH=$(top_builddir)/extras/gudev:$$LD_LIBRARY_PATH \ @@ -470,6 +471,7 @@ typelibsdir = $(GIRTYPELIBDIR) typelibs_DATA = extras/gudev/GUdev-1.0.typelib CLEANFILES += $(gir_DATA) $(typelibs_DATA) +endif # ENABLE_INTROSPECTION # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed libgudev-install-move-hook: diff --git a/configure.ac b/configure.ac index a2a042ba..357806a0 100644 --- a/configure.ac +++ b/configure.ac @@ -136,14 +136,22 @@ if test "x$enable_gudev" = xyes; then PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0]) AC_SUBST([GLIB_CFLAGS]) AC_SUBST([GLIB_LIBS]) +fi +AC_ARG_ENABLE([introspection], + AS_HELP_STRING([--disable-introspection], [disable GObject introspection]), + [], [enable_introspection=yes]) +if test "x$enable_introspection" = xyes; then PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2]) + AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support]) AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)]) AC_SUBST([G_IR_COMPILER], [$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)]) AC_SUBST([G_IR_GENERATE], [$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)]) AC_SUBST([GIRDIR], [$($PKG_CONFIG --define-variable=datadir=${datadir} --variable=girdir gobject-introspection-1.0)]) AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --define-variable=libdir=${libdir} --variable=typelibdir gobject-introspection-1.0)]) fi +AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes]) + AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = xyes]) # ------------------------------------------------------------------------------ @@ -235,6 +243,7 @@ AC_MSG_RESULT([ cflags: ${CFLAGS} ldflags: ${LDFLAGS} + gintrospection: ${enable_introspection} rule_generator: ${enable_rule_generator} hwdb: ${enable_hwdb} udev_acl: ${enable_udev_acl} -- 2.39.5