Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/configure.ac b/configure.ac
index fcc1186..b9dce62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,15 +34,15 @@ AC_INIT(libXdamage, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=x
 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)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Check damageext configuration, strip extra digits from package version to
 # find the required protocol version
@@ -50,12 +50,8 @@ XORG_CWARNFLAGS
 DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
 AC_SUBST(DAMAGEEXT_VERSION)
 PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto x11)
-XDAMAGE_CFLAGS="$CWARNFLAGS $XDAMAGE_CFLAGS"
 AC_SUBST(XDAMAGE_CFLAGS)
 
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile
           src/Makefile
            xdamage.pc])

diff --git a/src/Makefile.am b/src/Makefile.am
index 0aa9f4f..787fc04 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,8 @@ libXdamage_la_SOURCES = \
        xdamageint.h    \
        Xdamage.c
 
-libXdamage_la_LIBADD = $(XDAMAGE_LIBS) $(X_LIBS)
-AM_CFLAGS = $(XDAMAGE_CFLAGS) $(X_CFLAGS)
+libXdamage_la_LIBADD = $(XDAMAGE_LIBS)
+AM_CFLAGS = $(CWARNFLAGS) $(XDAMAGE_CFLAGS)
 
 INCLUDES = -I$(top_srcdir)/include/X11/extensions