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 | 5210e2aa9a83647bdb2d3407963a0a844c25ea4e (patch) | |
| tree | 7b25e2330dfb004fdf0523c389dc7a3d84b193f0 | |
| parent | 6734b4d24af6ca98ab41b824a858be5338c541b6 (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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 090ed0f..26afd0e 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,17 @@ AC_INIT(xclipboard, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# 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])]) + [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) AC_PROG_CC AC_PROG_INSTALL -XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_EXISTS([xkbfile], [XKBPKG="xkbfile"], [XKBPKG=""]) @@ -55,8 +55,5 @@ AC_ARG_WITH(appdefaultdir, [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) |