diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 16:22:30 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 16:22:30 -0700 |
| commit | bd89c302aa44c5a7a6e5f5d6e6f131e04b8e61c1 (patch) | |
| tree | fadeca9d3a5c7da117a5422aa6f66875af40aaea | |
| parent | 5e33ed3a2852a84fbbeb4fb4172928053cf677bf (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 69a7118..dfd8c83 100644 --- a/configure.ac +++ b/configure.ac @@ -26,16 +26,16 @@ AC_INIT(xdpyinfo,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo 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) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst) @@ -143,8 +143,4 @@ PKG_CHECK_MODULES(DPY_XTST, xtst, dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |