X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=358383635193553228fccd37c39c304ce336519c;hp=2e766a6a5d7cdb575c2ac98da2134126226efe81;hb=b650827875ae7dfd62f578e1345034a5f0f23ceb;hpb=a80db8bd5f7f15859e8891aab9fc3694ce4cd0bd

diff --git a/configure.ac b/configure.ac
index 2e766a6a5..358383635 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,12 @@ AM_PROG_CC_C_O
 AC_PROG_GCC_TRADITIONAL
 
 AC_PATH_PROG([M4], [m4])
-GTK_DOC_CHECK(1.10)
+
+# 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],[--flavour no-tmpl])
+],[ AM_CONDITIONAL([ENABLE_GTK_DOC],[false]) ])
+
 GOBJECT_INTROSPECTION_CHECK([1.31.1])
 
 AC_CHECK_TOOL(OBJCOPY, objcopy)
@@ -762,4 +767,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}
 ])