chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4193534
)
udev: use native instead of custom --disable-introspection logic
author
Kay Sievers
<kay@vrfy.org>
Fri, 13 Apr 2012 10:49:51 +0000
(12:49 +0200)
committer
Kay Sievers
<kay@vrfy.org>
Fri, 13 Apr 2012 10:49:51 +0000
(12:49 +0200)
Makefile.am
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 69811a31d51c270418d455d8ba6980f41a6e7f89..c68b2ace339f7eeca802e32c90443f5676a15856 100644
(file)
--- 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 $@
$(AM_V_GEN)glib-mkenums --template $^ > \
$@.tmp && mv $@.tmp $@
-if
ENABL
E_INTROSPECTION
+if
HAV
E_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
-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)
src/udev/gudev/GUdev-1.0.typelib
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif #
ENABL
E_INTROSPECTION
+endif #
HAV
E_INTROSPECTION
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libgudev-install-move-hook:
# 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 a2e67639081d9e2b72014e02030bff2e1da4708c..1d8c0e84729dffb73804fadad3c2e610277b8f6e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-56,6
+56,7
@@
AC_PROG_GCC_TRADITIONAL
AC_PATH_PROG([M4], [m4])
GTK_DOC_CHECK(1.10)
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)
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]) ])
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"])
# ------------------------------------------------------------------------------
AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
# ------------------------------------------------------------------------------