diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-15 17:07:10 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-15 17:09:58 -0700 |
| commit | 3b0fc7a5a6d4b4b6903a9ad6685e2441f9fe83a7 (patch) | |
| tree | 782851dca1a22624c2cfab02f807239ba6ab25a0 | |
| parent | 69334376346a96beb3df120a3eeeb7935923c388 (diff) | |
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, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 3fcf515..8bbaf2e 100644 --- a/configure.ac +++ b/configure.ac @@ -25,9 +25,11 @@ AC_INIT(xtrans, 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG macro -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 1.3 or later: 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 # Because xtrans is included into other modules rather than being linked # with, these defines have to be added to the cflags line @@ -47,8 +49,5 @@ sticky_bit_define="-DHAS_STICKY_DIR_BIT" AC_SUBST(sticky_bit_define) -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile xtrans.pc]) |