diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-23 21:59:12 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-23 21:59:36 +1000 |
| commit | 8ba417e3f3915102f99e08b15e1543680120102d (patch) | |
| tree | 6ced81bc5376e9cffd2f431628c1b50a1b4b03d0 | |
| parent | d992d9dd3af95132ca76f0479d08d3479b899a95 (diff) | |
Require macros 1.3 for XORG_DEFAULT_OPTIONS.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 4d8f502..d259f62 100644 --- a/configure.ac +++ b/configure.ac @@ -31,8 +31,8 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) # Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2.1) +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AC_PROG_CC AC_PROG_INSTALL @@ -46,7 +46,7 @@ AC_CHECK_FUNCS([srand48 lrand48]) AC_SEARCH_LIBS([recvfrom],[socket]) PKG_CHECK_MODULES(XDMCP, xproto) -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS XDMCP_CFLAGS="$CWARNFLAGS $XDMCP_CFLAGS" AC_SUBST(XDMCP_CFLAGS) AC_SUBST(XDMCP_LIBS) @@ -64,8 +64,5 @@ dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([Xdmcp]) -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile xdmcp.pc]) |