From b7be4a976a59f3149590cf62a2ea8144aa729c2a Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue, 6 Oct 2009 13:03:25 -0700
Subject: [PATCH] Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
---
 configure.ac    | 11 ++++-------
 src/Makefile.am |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index c6b6ca6..bd096f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,9 +36,9 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
 
-# Require xorg-macros version >= 1.2.0 for XORG_CWARNFLAGS & XORG_CHANGELOG
+# Require xorg-macros version >= 1.3.0 for 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)
 
 # Check for progs
 AC_PROG_CC
@@ -47,6 +47,8 @@ dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config
 dnl must first be located explicitly.
 PKG_PROG_PKG_CONFIG
 
+XORG_DEFAULT_OPTIONS
+
 # Look for headers
 AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
 AC_CHECK_FUNCS([poll])
@@ -189,8 +191,6 @@ PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto fontenc)
 # Transport selection macro from xtrans.m4
 XTRANS_CONNECTION_FLAGS
 
-XORG_CWARNFLAGS
-
 case $host_os in
     linux*)
         OS_CFLAGS="-D_XOPEN_SOURCE"
@@ -204,9 +204,6 @@ case $host_os in
 esac
 AC_SUBST([OS_CFLAGS])
 
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile
 	   src/Makefile
 	   src/fontfile/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 094275d..d658667 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@
 
 lib_LTLIBRARIES = libXfont.la
 
-AM_CFLAGS = $(OS_CFLAGS)
+AM_CFLAGS = $(OS_CFLAGS) $(CWARNFLAGS)
 
 if XFONT_FONTFILE
 FONTFILE_DIR = fontfile