summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 78b8827..7e2fb82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,10 @@ AC_INIT(xinit,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
@@ -41,6 +45,8 @@ AC_CHECK_FUNCS([killpg])
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+XORG_CWARNFLAGS
+
# Build options
DEFAULT_XRDB=xrdb
DEFAULT_XMODMAP=xmodmap
@@ -131,6 +137,7 @@ case $host_os in
;;
esac
+XINIT_CFLAGS="$CWARNFLAGS $XINIT_CFLAGS"
AC_SUBST(XINIT_CFLAGS)
AC_SUBST(XINIT_LIBS)
@@ -184,6 +191,7 @@ AC_DEFINE(XORG, 1, [Define if you have Xorg X server])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])
AC_OUTPUT([privileged_startx/Makefile])