svn merge ^/branches/released .

1 files changed, 82 insertions, 75 deletions

diff --git a/libXau/configure.ac b/libXau/configure.ac
index db51f0c3a..09a872e05 100644
--- a/libXau/configure.ac
+++ b/libXau/configure.ac
@@ -1,75 +1,82 @@
-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

-

-AC_CONFIG_HEADERS(config.h)

-

-# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS

-m4_ifndef([XORG_MACROS_VERSION],

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

-XORG_MACROS_VERSION(1.8)

-XORG_DEFAULT_OPTIONS

-

-AC_PROG_LN_S

-AC_LIBTOOL_WIN32_DLL

-AM_PROG_LIBTOOL

-

-PKG_CHECK_MODULES(XAU, xproto)

-

-AC_ARG_ENABLE(xthreads,

-              AS_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

-           man/Makefile

-           xau.pc])

+#
+#  Copyright © 2003 Keith Packard, Noah Levitt
+#
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Keith Packard not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Keith Packard makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+#
+#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+#
+
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([libXau], [1.0.6],
+	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXau])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Initialize libtool
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
+
+# Checks for programs.
+AC_PROG_LN_S
+
+# Obtain compiler/linker options for depedencies
+PKG_CHECK_MODULES(XAU, xproto)
+
+AC_ARG_ENABLE(xthreads,
+              AS_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
+
+# 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
+
+# Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([Xau])
+LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}"
+
+AC_CONFIG_FILES([Makefile
+		man/Makefile
+		xau.pc])
+AC_OUTPUT