libxau: Changes to 'upstream-unstable'
COPYING | 2 +-
Makefile.am | 11 ++++-------
configure.ac | 12 +++++++++---
3 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit 7f6275300243fd15ce974d1b5e478b47f7758485
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Aug 26 14:19:19 2008 -0700
Version bump: 1.0.4
diff --git a/configure.ac b/configure.ac
index 65884c3..9e1b2a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXau, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
+AC_INIT(libXau, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 753bf38ceca4a0c8d6c6c1845b4387e4b3c9e4f0
Author: Damien Th?bault <damien.thebault@gmail.com>
Date: Tue Aug 26 14:16:44 2008 -0700
Bug 17314: libXau's Makefile.am should have proper man creation rules
X.Org Bugzilla #17314 <http://bugs.freedesktop.org/show_bug.cgi?id=17314>
Patch #18528 <http://bugs.freedesktop.org/attachment.cgi?id=18528>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Makefile.am b/Makefile.am
index b597622..635fdb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,7 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
libmandir = $(LIB_MAN_DIR)
libman_PRE = Xau.man
-BUILT_SOURCES = shadows.DONE
+BUILT_SOURCES = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(Xau_shadows:=.@LIB_MAN_SUFFIX@)
@@ -73,12 +73,9 @@ Xau_shadows = \
XauGetAuthByAddr \
XauGetBestAuthByAddr
-shadows.DONE:
- -rm -f $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xau_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- touch shadows.DONE
+Xau_shadows_man = $(Xau_shadows:=.@LIB_MAN_SUFFIX@)
+$(Xau_shadows_man):
+ echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $@
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
commit a0b2aac596ea2cbe4d0ec1ef8c406ad98f0c499d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jul 8 15:08:35 2008 -0700
SVR4 (including Solaris) puts gethostbyname_r in libnsl instead of libc
diff --git a/configure.ac b/configure.ac
index e35d16f..65884c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,8 +55,14 @@ AC_ARG_ENABLE(xthreads,
if test "x$xthreads" = "xyes" ; then
AC_DEFINE(XTHREADS,1,[Whether libXau is compiled with thread support])
- AC_CHECK_LIB(c, gethostbyname_r, AC_DEFINE(XUSE_MTSAFE_API,1,
- [Whether libXau needs to use MT safe API's]))
+ 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
commit 1bc9f04963a8a236cc190e75e32282774b556932
Author: Daniel Drake <ddrake@brontes3d.com>
Date: Tue May 29 14:06:00 2007 -0800
Bug #11097: libXau COPYING fix (add missing copyright dates)
X.Org Bugzilla #11097 <https://bugs.freedesktop.org/show_bug.cgi?id=11097>
diff --git a/COPYING b/COPYING
index dbd8ab0..64492ad 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright 1988, 1998 The Open Group
+Copyright 1988, 1993, 1994, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
Reply to: