diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-05 23:53:33 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-05 23:53:33 -0700 |
| commit | cfa048b4aa351068415c5e2711731246a9c19322 (patch) | |
| tree | 9ffd6256910fcb0f26ebf174f31710f95d49e89b | |
| parent | 5957fdd9ba2aba60e90a30bc3744f76ddb27b8d2 (diff) | |
| download | xorg-lib-libXft-cfa048b4aa351068415c5e2711731246a9c19322.tar.gz | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 396a456..35a3c7f 100644 --- a/configure.ac +++ b/configure.ac @@ -36,15 +36,15 @@ AC_CONFIG_AUX_DIR(.) 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) # checks for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # # Check for Xrender @@ -132,9 +132,6 @@ if test "$VERSION" = "" ; then VERSION=$PACKAGE_VERSION; fi -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile xft.pc xft-config |