Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Also some changes to man/Makefile.am to make it work better with the
AM_SILENT_RULES option that's enabled in XORG_DEFAULT_OPTIONS

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

configure.ac

@@ -36,15 +36,17 @@ AC_INIT(libXcomposite, 0.4.0, [https://bugs.freedesktop.org/enter_bug.cgi?produc
 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)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+
+XORG_DEFAULT_OPTIONS
 
 AC_ARG_VAR([XMLTO], [Path to xmlto command])
 AC_PATH_PROG([XMLTO], [xmlto])
@@ -62,14 +64,9 @@ fi
 COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
 AC_SUBST(COMPOSITEEXT_VERSION)
 PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext fixesproto)
-XCOMPOSITE_CFLAGS="$CWARNFLAGS $XCOMPOSITE_CFLAGS"
 AC_SUBST(XCOMPOSITE_CFLAGS)
 AC_SUBST(XCOMPOSITE_LIBS)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile
 	   src/Makefile
 	   man/Makefile

man/Makefile.am

@@ -19,8 +19,10 @@ Xcomposite_man_aliases = 			\
 	XCompositeGetOverlayWindow		\
 	XCompositeReleaseOverlayWindow
 
+Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
+
 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
+	      $(Xcomposite_shadowmen)
 
 EXTRA_DIST  = $(libman_PRE) $(libman_xml)
 
@@ -29,17 +31,8 @@ CLEANFILES  = $(libman_DATA)
 MAINTAINERCLEANFILES = $(libman_PRE)
 
 # Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-BUILT_SOURCES = shadows.DONE
-
-shadows.DONE:
-	-rm -f $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
-	(for i in $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
-	echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $$i; \
-	done)
-	touch shadows.DONE
-
-CLEANFILES += shadows.DONE
+$(Xcomposite_shadowmen):
+	$(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@
 
 # Substitute system-specific values in man pages
 
@@ -62,7 +55,7 @@ MAN_SUBSTS = \
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
 
 .man.$(LIB_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
 
 # Generate nroff sources from DocBook/xml
 
@@ -70,7 +63,7 @@ dist-hook: $(libman_PRE)
 
 if HAVE_XMLTO
 .xml.man:
-	$(XMLTO) man $< && mv $*.__libmansuffix__ $@
+	$(AM_V_GEN)$(XMLTO) man $< && mv $*.__libmansuffix__ $@
 else
 .xml.man:
 	@echo "WARNING: configure did not find xmlto, cannot create $@ without it"

src/Makefile.am

@@ -19,7 +19,8 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libXcomposite.la