From 1a1c157c7abccc03a37c26e63ad923fd7dfecc5c Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon, 21 Sep 2009 20:54:04 -0700
Subject: Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
---
 configure.ac | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index c760cb5..3c7bd1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,16 +26,16 @@ AC_INIT(xclock,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
 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)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 AC_CHECK_FUNCS([strlcpy getpid])
 
@@ -45,7 +45,7 @@ AC_SEARCH_LIBS([iconv], [iconv],
 dnl Required dependencies
 PKG_CHECK_MODULES(XCLOCK_X11, x11)
 PKG_CHECK_MODULES(XAW, xaw7)
-XCLOCK_CFLAGS="$CWARNFLAGS $XCLOCK_X11_CFLAGS $XAW_CFLAGS"
+XCLOCK_CFLAGS="$XCLOCK_X11_CFLAGS $XAW_CFLAGS"
 XCLOCK_LIBS="$XCLOCK_X11_LIBS $XAW_LIBS"
 
 dnl Optional dependencies
@@ -78,8 +78,4 @@ AC_ARG_WITH(appdefaultdir,
 	[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
 AC_SUBST(appdefaultdir)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3