summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 9961977..9b5bdfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,11 +26,15 @@ AC_INIT(xrx,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],x
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
AC_PROG_INSTALL
AM_PROG_LIBTOOL
+XORG_CWARNFLAGS
dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
dnl was not expanded, since libX11 with no transport types is rather useless.
@@ -46,6 +50,7 @@ XTRANS_CONNECTION_FLAGS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XRX, x11 xt xext xtrans xproxymngproto xau)
+XRX_CFLAGS="$CWARNFLAGS $XRX_CFLAGS"
AC_SUBST(XRX_CFLAGS)
AC_SUBST(XRX_LIBS)
@@ -72,6 +77,7 @@ AC_SUBST(XRX_PLUGIN_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([
Makefile