summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-04-13 12:49:51 +0200
committerKay Sievers <kay@vrfy.org>2012-04-13 12:49:51 +0200
commit0eaeca1f2373a323b98c86b47561d98e59c67b25 (patch)
tree6443d1f5b180f4737260f2b6e628bcaf4becf607
parent4193534e12fb4eaf635df414970eb54ef7174513 (diff)
udev: use native instead of custom --disable-introspection logic
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac10
2 files changed, 3 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 69811a31d5..c68b2ace33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1699,7 +1699,7 @@ src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/ud
$(AM_V_GEN)glib-mkenums --template $^ > \
$@.tmp && mv $@.tmp $@
-if ENABLE_INTROSPECTION
+if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
@@ -1743,7 +1743,7 @@ typelibs_DATA = \
src/udev/gudev/GUdev-1.0.typelib
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif # ENABLE_INTROSPECTION
+endif # HAVE_INTROSPECTION
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libgudev-install-move-hook:
diff --git a/configure.ac b/configure.ac
index a2e6763908..1d8c0e8472 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ AC_PROG_GCC_TRADITIONAL
AC_PATH_PROG([M4], [m4])
GTK_DOC_CHECK(1.10)
+GOBJECT_INTROSPECTION_CHECK([1.31.1])
AC_CHECK_TOOL(OBJCOPY, objcopy)
AC_CHECK_TOOL(STRINGS, strings)
@@ -455,15 +456,6 @@ AC_ARG_ENABLE([gudev],
AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
[], [enable_gudev=yes])
AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0]) ])
-
-AC_ARG_ENABLE([introspection],
- AS_HELP_STRING([--disable-introspection], [disable GObject introspection @<:@default=enabled@:>@]),
- [], [enable_introspection=yes])
-AS_IF([test "x$enable_introspection" = "xyes"], [
- AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support])
- GOBJECT_INTROSPECTION_REQUIRE([1.31.1])
-])
-AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = "xyes"])
AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
# ------------------------------------------------------------------------------