diff options
author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 15:42:08 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 15:42:08 -0700 |
commit | dbd3a05ab990f5d2827b84ab81e7b1a19cd0b786 (patch) | |
tree | 909b1537ff904b46ebd2a72bf6923b5d6473aca6 | |
parent | 3341f135515f6f2e5b0c40f5ec0a8fb59d4cb1ed (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, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 4982b3f..595aa02 100644 --- a/configure.ac +++ b/configure.ac @@ -25,14 +25,15 @@ AC_INIT(xset,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS # Checks for system functions AC_CHECK_FUNCS([usleep]) @@ -81,8 +82,4 @@ XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTC AC_SUBST(XSET_CFLAGS) AC_SUBST(XSET_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |