Update to libXmu 1.1.0. No functional change.

1 files changed, 15 insertions, 14 deletions

diff --git a/lib/libXmu/configure.ac b/lib/libXmu/configure.ac
index f521572e4..69ea57031 100644
--- a/lib/libXmu/configure.ac
+++ b/lib/libXmu/configure.ac
@@ -2,38 +2,38 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
 
 AC_INIT([libXmu],
-        1.0.5,
+        [1.1.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-        libXmu)
+        [libXmu])
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.10)
+XORG_DEFAULT_OPTIONS
+XORG_ENABLE_DOCS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+XORG_CHECK_SGML_DOCTOOLS(1.5)
+
 AM_CONFIG_HEADER([config.h])
 
 
 # Checks for programs.
 AC_PROG_LIBTOOL
-AC_PROG_CC
-XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
-AC_SUBST(XMU_CFLAGS)
-AC_SUBST(XMU_LIBS)
-
 PKG_CHECK_MODULES(XMUU, x11)
-AC_SUBST(XMUU_CFLAGS)
-AC_SUBST(XMUU_LIBS)
 
 # CvtStdSel.c needs to know which network transports to build hostname
 # conversion routines for
@@ -63,6 +63,7 @@ LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`
 AC_SUBST(LINTLIBUU)
 
 AC_OUTPUT([Makefile
+           doc/Makefile
            include/Makefile
 	   src/Makefile
 	   xmu.pc