svn merge ^/branches/released .

1 files changed, 78 insertions, 84 deletions

diff --git a/libXau/configure.ac b/libXau/configure.ac
index c63adcbee..98e0184d6 100644
--- a/libXau/configure.ac
+++ b/libXau/configure.ac
@@ -1,84 +1,78 @@
-dnl 
-dnl  $Id$
-dnl 
-dnl  Copyright © 2003 Keith Packard, Noah Levitt
-dnl 
-dnl  Permission to use, copy, modify, distribute, and sell this software and its
-dnl  documentation for any purpose is hereby granted without fee, provided that
-dnl  the above copyright notice appear in all copies and that both that
-dnl  copyright notice and this permission notice appear in supporting
-dnl  documentation, and that the name of Keith Packard not be used in
-dnl  advertising or publicity pertaining to distribution of the software without
-dnl  specific, written prior permission.  Keith Packard makes no
-dnl  representations about the suitability of this software for any purpose.  It
-dnl  is provided "as is" without express or implied warranty.
-dnl 
-dnl  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl  PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
-
-AC_PREREQ([2.57])
-AC_INIT(libXau, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
-AM_INIT_AUTOMAKE([dist-bzip2])
-AM_MAINTAINER_MODE
-
-AM_CONFIG_HEADER(config.h)
-
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-XORG_CWARNFLAGS
-
-PKG_CHECK_MODULES(XAU, xproto)
-XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS"
-AC_SUBST(XAU_CFLAGS)
-AC_SUBST(XAU_LIBS)
-
-AC_ARG_ENABLE(xthreads,
-              AC_HELP_STRING([--disable-xthreads],
-                [Disable libXau support for Multithreading]),
-              [xthreads=$enableval],[xthreads=yes])
-
-if test "x$xthreads" = "xyes" ; then
-    AC_DEFINE(XTHREADS,1,[Whether libXau is compiled with thread support])
-    AC_CHECK_LIB(c, gethostbyname_r, [mtsafe=yes])
-    if test "x$mtsafe" = "x" ; then
-	AC_CHECK_LIB(nsl, gethostbyname_r, [mtsafe=yes])
-    fi
-    if test "x$mtsafe" = "xyes" ; then
-	AC_DEFINE(XUSE_MTSAFE_API, 1, 
-		  [Whether libXau needs to use MT safe API's])
-    fi
-
-dnl XXX incomplete, please fill this in
-    case $host_os in
-    solaris*)
-	XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
-    esac
-    XAU_CFLAGS="$XAU_CFLAGS $XTHREAD_CFLAGS"
-fi
-
-dnl Allow checking code with lint, sparse, etc.
-XORG_WITH_LINT
-XORG_LINT_LIBRARY([Xau])
-LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}"
-
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
-AC_OUTPUT([Makefile
-           xau.pc])
+dnl 

+dnl  Copyright © 2003 Keith Packard, Noah Levitt

+dnl 

+dnl  Permission to use, copy, modify, distribute, and sell this software and its

+dnl  documentation for any purpose is hereby granted without fee, provided that

+dnl  the above copyright notice appear in all copies and that both that

+dnl  copyright notice and this permission notice appear in supporting

+dnl  documentation, and that the name of Keith Packard not be used in

+dnl  advertising or publicity pertaining to distribution of the software without

+dnl  specific, written prior permission.  Keith Packard makes no

+dnl  representations about the suitability of this software for any purpose.  It

+dnl  is provided "as is" without express or implied warranty.

+dnl 

+dnl  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+dnl  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+dnl  PERFORMANCE OF THIS SOFTWARE.

+dnl

+dnl Process this file with autoconf to create configure.

+

+AC_PREREQ([2.60])

+AC_INIT(libXau, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)

+AM_INIT_AUTOMAKE([foreign dist-bzip2])

+AM_MAINTAINER_MODE

+

+AM_CONFIG_HEADER(config.h)

+

+# Require xorg-macros: XORG_DEFAULT_OPTIONS

+m4_ifndef([XORG_MACROS_VERSION],

+          [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])

+XORG_MACROS_VERSION(1.4)

+XORG_DEFAULT_OPTIONS

+

+AC_PROG_CC

+AC_PROG_INSTALL

+AC_PROG_LN_S

+AC_LIBTOOL_WIN32_DLL

+AM_PROG_LIBTOOL

+AC_PROG_MAKE_SET

+AC_PROG_SED

+

+PKG_CHECK_MODULES(XAU, xproto)

+

+AC_ARG_ENABLE(xthreads,

+              AC_HELP_STRING([--disable-xthreads],

+                [Disable libXau support for Multithreading]),

+              [xthreads=$enableval],[xthreads=yes])

+

+if test "x$xthreads" = "xyes" ; then

+    AC_DEFINE(XTHREADS,1,[Whether libXau is compiled with thread support])

+    AC_CHECK_LIB(c, gethostbyname_r, [mtsafe=yes])

+    if test "x$mtsafe" = "x" ; then

+	AC_CHECK_LIB(nsl, gethostbyname_r, [mtsafe=yes])

+    fi

+    if test "x$mtsafe" = "xyes" ; then

+	AC_DEFINE(XUSE_MTSAFE_API, 1, 

+		  [Whether libXau needs to use MT safe API's])

+    fi

+

+dnl XXX incomplete, please fill this in

+    case $host_os in

+    solaris*)

+	XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;

+    esac

+    XAU_CFLAGS="$XAU_CFLAGS $XTHREAD_CFLAGS"

+fi

+

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

+XORG_WITH_LINT

+XORG_LINT_LIBRARY([Xau])

+LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}"

+

+

+AC_OUTPUT([Makefile

+           xau.pc])