svn merge ^/branches/released .

1 files changed, 46 insertions, 69 deletions

diff --git a/libXmu/configure.ac b/libXmu/configure.ac
index f521572e4..0e2b64e92 100644
--- a/libXmu/configure.ac
+++ b/libXmu/configure.ac
@@ -1,69 +1,46 @@
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.57)
-
-AC_INIT([libXmu],
-        1.0.5,
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-        libXmu)
-
-AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([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)
-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
-XTRANS_CONNECTION_FLAGS
-
-#
-# Assume that we have sprintf. If a system shows up
-# that doesn't, we will deal with it at that point.
-#
-# The way to deal with it is:
-#
-#  1. Add a test for sprintf it here in configure.ac
-#     that sets or unsets HAS_SNPRINTF as appropriate
-#
-#  2. add a copy of xc/lib/misc/snprintf.c
-#
-# The source file in question is Lower.c
-#
-
-AC_DEFINE(HAS_SNPRINTF, [], [Whether we have snprintf()])
-AC_SUBST(HAS_SNPRINTF)
-
-dnl Allow checking code with lint, sparse, etc.
-XORG_WITH_LINT
-XORG_LINT_LIBRARY([Xmu])
-LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`
-AC_SUBST(LINTLIBUU)
-
-AC_OUTPUT([Makefile
-           include/Makefile
-	   src/Makefile
-	   xmu.pc
-           xmuu.pc])
+

+# Initialize Autoconf

+AC_PREREQ([2.60])

+AC_INIT([libXmu], [1.1.0],

+	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu])

+AC_CONFIG_SRCDIR([Makefile.am])

+AC_CONFIG_HEADERS([config.h])

+

+# Initialize Automake

+AM_INIT_AUTOMAKE([foreign dist-bzip2])

+AM_MAINTAINER_MODE

+

+# Initialize libtool

+AC_PROG_LIBTOOL

+

+# 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)

+

+# Obtain compiler/linker options for depedencies

+PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)

+PKG_CHECK_MODULES(XMUU, x11)

+

+# CvtStdSel.c needs to know which network transports to build hostname

+# conversion routines for

+XTRANS_CONNECTION_FLAGS

+

+# Allow checking code with lint, sparse, etc.

+XORG_WITH_LINT

+XORG_LINT_LIBRARY([Xmu])

+LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`

+AC_SUBST(LINTLIBUU)

+

+AC_CONFIG_FILES([Makefile

+		doc/Makefile

+		include/Makefile

+		src/Makefile

+		xmu.pc

+		xmuu.pc])

+AC_OUTPUT