diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2014-05-18 11:41:54 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2014-05-18 11:41:54 +0200 |
| commit | 2061a359a1f8968c88fa8ff5b9cb4739361ac33d (patch) | |
| tree | 9cb1038942537b5bfab84208a1edc1ab81dfb28b /configure.ac | |
| parent | 74bab88412f8c88b948ffb565f490005ac886b32 (diff) | |
| parent | 1b23094a8606bf383ec6c7803a9cd300b1bb96a7 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
Conflicts:
xinitrc.cpp
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b464d68..02cb80c 100644 --- a/configure.ac +++ b/configure.ac @@ -31,10 +31,10 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require X.Org macros 1.8 or later for AC_PROG_SED in XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.19 or later for TRADITIONALCPPFLAGS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.8) + [m4_fatal([must install xorg-macros 1.19 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.19) XORG_DEFAULT_OPTIONS XORG_PROG_RAWCPP |