X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=864c54459a7f914b2087308bb7a23ab0fe760c0b;hb=927735238d1cfe9bd9d9db71025e801c391cb156;hp=793b9437eca4e2323154d244ed64a8869340483e;hpb=bb061708d5aa83579f213bdfb67253f7027217c3;p=elogind.git

diff --git a/configure.ac b/configure.ac
index 793b9437e..864c54459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,13 +16,19 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-AC_PREREQ(2.63)
+AC_PREREQ([2.64])
+
+AC_INIT([systemd],
+        [182],
+        [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
+        [systemd],
+        [http://www.freedesktop.org/wiki/Software/systemd])
 
-AC_INIT([systemd],[182],[systemd-devel@lists.freedesktop.org])
-AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd])
 AC_CONFIG_SRCDIR([src/core/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([build-aux])
+
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_PREFIX_DEFAULT([/usr])
@@ -55,8 +61,15 @@ 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])])
+
+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)
@@ -756,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}
 ])