summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2014-01-07 14:00:38 -0500
committerArnaud Fontaine <arnau@debian.org>2014-01-30 12:09:34 +0900
commitc4f2c70bc37a592406b7693562c7513f2f99b34d (patch)
treea940d55cf0a06bd9c785ef18edd990a4faf2c6f7 /configure.ac
parente7263931aff3e3450dc938ad465a7577f943549f (diff)
autoconf: use XORG_DEFAULT_OPTIONS
XCB has been part of X.Org for a while now. This patch will harmonize the XCB configuration, using xorg-macros series of macros. It is already used in the XCB utils packages and is needed to build xcb-proto. The XORG_DEFAULT_OPTIONS already includes the statement for the silent rules. The AC_PROG_CC statement is removed so as not to override AC_PROG_CC_C99 in XORG_DEFAULT_OPTIONS. The effective change is that xcb now uses c99 as requested. Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 6d0f844..e6a837f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,6 @@ AC_CONFIG_SRCDIR([xcb.pc.in])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# Set common system defines for POSIX extensions, such as _GNU_SOURCE
# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
@@ -28,7 +27,12 @@ AC_CONFIG_HEADERS([src/config.h])
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
-AC_PROG_CC
+
+# Require xorg-macros minimum of 1.18 - Initial version
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.18 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.18)
+XORG_DEFAULT_OPTIONS
XSLTPROC=no
HTML_CHECK_RESULT=no