From c47f33a498f9c824a48c23987b312b3176602f7f Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Thu, 15 Nov 2012 20:18:22 -0500 Subject: Second step of revamping the build system The original Makefile.am was drawn to the top level. This commit breaks it out into the various directories with SUBDIRS connecting them. This makes each directory easier to maintain. --- configure.ac | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f62d5317e7..640255e971 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ AC_PROG_MAKE_SET AC_PATH_PROG([M4], [m4]) AC_PATH_PROG([XSLTPROC], [xsltproc]) +GTK_DOC_CHECK([1.18],[--flavour no-tmpl]) # TODO check this --- we don't want kmod necessarily # PKG_CHECK_MODULES(KMOD, [libkmod >= 5]) @@ -108,6 +109,14 @@ AS_IF([test "x$with_python" != "xno"], [ ]) AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test "$have_python_devel" = "yes"]) +# ------------------------------------------------------------------------------ + +have_introspection=no +AC_ARG_ENABLE([introspection], + [AS_HELP_STRING([--without-introspection], [Disable man page index and systemd-python (default: no)])]) +GOBJECT_INTROSPECTION_CHECK([1.31.1]) +AM_CONDITIONAL([HAVE_INTROSPECTION], [test "$have_introspection" = "yes"]) + # ------------------------------------------------------------------------------ have_selinux=no AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support])) @@ -242,6 +251,18 @@ AC_SUBST([rootlibdir], [$with_rootlibdir]) # ------------------------------------------------------------------------------ AC_CONFIG_FILES([Makefile + docs/Makefile docs/gudev/Makefile - docs/libudev/Makefile]) + docs/libudev/Makefile + hwdb/Makefile + keymaps-force-release/Makefile + keymaps/Makefile + man/Makefile + rules/Makefile + src/Makefile + src/gudev/Makefile + src/libudev/Makefile + src/test/Makefile + src/udev/Makefile + test/Makefile]) AC_OUTPUT -- cgit v1.2.3-54-g00ecf