summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-16 18:46:24 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-16 18:46:24 -0700
commit864b472e096a8c6ca8f86f78615da023adeb60fd (patch)
tree5be235e9ed0cbcfb6e7ea043239ee4b8324db7b3 /configure.ac
parent917138713d60631c6d2e03afae88e7425caa7afd (diff)
downloadxkbutils-864b472e096a8c6ca8f86f78615da023adeb60fd.tar.gz
xkbutils-864b472e096a8c6ca8f86f78615da023adeb60fd.tar.bz2
xkbutils-864b472e096a8c6ca8f86f78615da023adeb60fd.zip
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index a6f68fb..dec6396 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,10 @@ AC_INIT(xkbutils,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo
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 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)
AM_CONFIG_HEADER(config.h)
@@ -36,23 +37,20 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_INSTALL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# xkbvleds checks
PKG_CHECK_MODULES(XKBVLEDS, xaw7)
-XKBVLEDS_CFLAGS="$CWARNFLAGS $XKBVLEDS_CFLAGS"
AC_SUBST(XKBVLEDS_CFLAGS)
AC_SUBST(XKBVLEDS_LIBS)
# xkbbell checks
PKG_CHECK_MODULES(XKBBELL, xkbfile x11 inputproto)
-XKBBELL_CFLAGS="$CWARNFLAGS $XKBBELL_CFLAGS"
AC_SUBST(XKBBELL_CFLAGS)
AC_SUBST(XKBBELL_LIBS)
# xkbwatch checks
PKG_CHECK_MODULES(XKBWATCH, xaw7)
-XKBWATCH_CFLAGS="$CWARNFLAGS $XKBWATCH_CFLAGS"
AC_SUBST(XKBWATCH_CFLAGS)
AC_SUBST(XKBWATCH_LIBS)