diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-27 15:07:24 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-10-27 15:07:24 -0400 |
| commit | 2d4c65a3e62c00e7907dc3f8929cbf8989fc783d (patch) | |
| tree | 1c5981f15d0c625fef774c0ce8b200b4e00c5281 | |
| parent | f33e95d44bd378a4a7632f6b591e21b23a861486 (diff) | |
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b123a1f..b0ad7c0 100644 --- a/configure.ac +++ b/configure.ac @@ -26,9 +26,11 @@ AC_INIT(xdm,[1.1.9],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xd AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) @@ -41,7 +43,6 @@ AM_PROG_LIBTOOL AC_PROG_INSTALL XORG_PROG_RAWCPP -XORG_DEFAULT_OPTIONS XORG_WITH_LINT m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes]) |