X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=864c54459a7f914b2087308bb7a23ab0fe760c0b;hb=20bbd54f603994a3cc211d2795de16550882ed8d;hp=5a4fc84588a265d7c6e309f229a002e34c6244fe;hpb=92ec4495f76a7a2a6c31f5bb2a5240f78dcfe1d2;p=elogind.git

diff --git a/configure.ac b/configure.ac
index 5a4fc8458..864c54459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,16 +62,14 @@ AC_PROG_GCC_TRADITIONAL
 
 AC_PATH_PROG([M4], [m4])
 
-# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
-# it on it's own line.
+# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
 m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.18])
-],[
-AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
-])
-
+GTK_DOC_CHECK([1.18],[--flavour no-tmpl])
+], [AM_CONDITIONAL([ENABLE_GTK_DOC], [false])])
 
+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
 GOBJECT_INTROSPECTION_CHECK([1.31.1])
+], [AM_CONDITIONAL([HAVE_INTROSPECTION], [false])])
 
 AC_CHECK_TOOL(OBJCOPY, objcopy)
 AC_CHECK_TOOL(STRINGS, strings)
@@ -771,4 +769,8 @@ AC_MSG_RESULT([
         D-Bus interfaces dir:    ${with_dbusinterfacedir}
         Split /usr:              ${enable_split_usr}
         man pages:               ${have_manpages}
+
+        CFLAGS:                  ${CFLAGS}
+        CPPLAGS:                 ${CPPFLAGS}
+        LDFLAGS:                 ${LDFLAGS}
 ])