diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-11-10 06:31:13 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-11-10 06:49:48 +0100 |
| commit | 882bcd951c8830218eed7d9c91ff675d14ed9cad (patch) | |
| tree | 7f80be7eca9088850dc958298dbc04e809ab3aa7 | |
| parent | 088fbefafdf9deec211f7069b5ad0836f462cbab (diff) | |
gudev: fix pkg-config call to work with "make distcheck"
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 92598a60c2..08ff1578f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,7 @@ AM_LDFLAGS = \ -Wl,--as-needed DISTCHECK_CONFIGURE_FLAGS = \ - --enable-gtk-doc \ - --enable-extras + --enable-gtk-doc CLEANFILES = @@ -364,6 +363,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 \ @@ -391,14 +391,12 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER) $(AM_V_GEN)g-ir-compiler $< -o $@ -if ENABLE_INTROSPECTION girdir = $(GIRDIR) gir_DATA = extras/gudev/GUdev-1.0.gir typelibsdir = $(GIRTYPELIBDIR) typelibs_DATA = extras/gudev/GUdev-1.0.typelib -EXTRA_DIST += GUdev-1.0.gir CLEANFILES += $(gir_DATA) $(typelibs_DATA) endif # ENABLE_INTROSPECTION diff --git a/configure.ac b/configure.ac index 3afb94a82c..3cb2299ce1 100644 --- a/configure.ac +++ b/configure.ac @@ -85,16 +85,16 @@ fi AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes]) AC_ARG_ENABLE([introspection], - AS_HELP_STRING([--enable-introspection], [enable GObject introspection]), - [], [enable_introspection=no]) + 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 --variable=girdir gobject-introspection-1.0)]) - AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)]) + AC_SUBST([GIRDIR], [$($PKG_CONFIG --define-variable=prefix=${prefix} --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]) |