diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-30 13:20:19 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-10-30 13:20:19 -0700 |
| commit | 23565e2abdf835262fce10129af6bb9e40139d0b (patch) | |
| tree | 4aaf18714735e224b6a71dd6c64c87058550b770 | |
| parent | 1e7b65ae3753c2e0c4f059cd1b1edd7fb0d8556c (diff) | |
Deploy the new XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 22067ec..ff902ea 100644 --- a/configure.ac +++ b/configure.ac @@ -26,19 +26,17 @@ AC_INIT(proxymngr,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=x 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], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS # The program itself has a header called config.h so # we have to choose a different name AM_CONFIG_HEADER(xconfig.h) AC_PROG_CPP -AC_PROG_CC -AC_PROG_INSTALL - -XORG_CWARNFLAGS AC_PATH_PROG(LBXPROXY, lbxproxy) if [[ -z $LBXPROXY ]] ; then @@ -63,8 +61,4 @@ AC_CHECK_FUNC(strcasecmp, [], # Needed to check for IPv6 support and set flags appropriately XTRANS_TCP_FLAGS -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |