Tue Jul 10 03:03:01 2012 UTC ()
Update from 1.3.5 to 1.5.0 based on PR pkg/46183

 [ANNOUNCE] libX11 1.5.0
------------------------
 At long last, the stable release of Xlib 1.5.0.

 While it only strictly requires libxcb 1.2, it's recommended that libxcb 1.8.1
 be used to get the fix for network connection fallback from Unix sockets to
 TCP that replaces the code previously found in libX11.

 Since there have been no changes since the final release candidate,
 here's the full list of changes since libX11 1.4.4:

    ( Some 150 lines omitted, see following URL for detail )
 http://lists.x.org/archives/xorg-announce/2012-June/001970.html

[ANNOUNCE] libX11 1.4.4
-----------------------
Thu, 28 Jul 2011 20:05:49 -0700 by  Alan Coopersmith

Another bug fix release of libX11 brings another large set of fixes
found by static analysis or to ease further static analysis, many
documentation fixes and improvments, and improved assertions to
help users and developers figure out why Xlib just crashed on them.

[ANNOUNCE] libX11 1.4.3
-----------------------
Tue Apr 5 14:18:18 PDT 2011 by Alan Coopersmith

A minor release of libX11 to add support for the Sinhala keysyms required
by the recent xkb-config 2.2 release.   Note that to get full support for
these keysyms you will also need to upgrade to x11proto 7.0.21 before
building the new libX11.

[ANNOUNCE] libX11 1.4.2
-----------------------
This bugfix release pulls in a ton of fixes for problems found by code static
analysis tools.  Many thanks to everyone who has helped find and fix these
issues before they turned into nasty problems.

Additionally, Jamey Sharp has provided some fixes for Display lock handling
that caused some deadlocks when using xcb for transport (which was optional
in 1.3.x and is required in 1.4.x), so this update is highly recomended to
users of multi-threaded Xlib applications.

[ANNOUNCE] libX11 1.4.1
------------------------
Tue, 11 Jan 2011 22:35:19 -0800 by Alan Coopersmith

This bugfix release corrects two small issues in Xlib event handling,
and provides, for the first time ever, the XKB API spec in DocBook format.

[ANNOUNCE] libX11 1.4.0
------------------------
Sun Nov 21 14:38:32 PST 2010 by Alan Coopersmith

After 3 release candidates, it's finally done - libX11 1.4 is released.

As previously warned, libX11 1.4 *requires* libxcb.   The Xlib 1.3 branch
continues to support the --without-xcb option for the benefit of any
remaining distributors who do not yet ship XCB in their stable releases.

[ANNOUNCE] libX11 1.3.6
------------------------
2010-09-20 6:16:18 by Daniel Stone

Just a small maintenance release for libX11; pending any catastrophic
bugs, this will probably be the last release from the 1.3.x branch.  The
XStringToKeysym changes should provide a not-insignificant speedup for
X server and application startup.


(mef)
diff -r1.26 -r1.27 pkgsrc/x11/libX11/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/libX11/PLIST
diff -r1.18 -r1.19 pkgsrc/x11/libX11/distinfo
diff -r1.9 -r1.10 pkgsrc/x11/libX11/patches/patch-aa
diff -r1.11 -r1.12 pkgsrc/x11/libX11/patches/patch-ac
cvs diff -r1.26 -r1.27 pkgsrc/x11/libX11/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libX11/Makefile 2011/09/18 11:55:22 1.26
+++ pkgsrc/x11/libX11/Makefile 2012/07/10 03:03:01 1.27
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.26 2011/09/18 11:55:22 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.27 2012/07/10 03:03:01 mef Exp $
2# 2#
3 3
4DISTNAME= libX11-1.3.5 4DISTNAME= libX11-1.5.0
5CATEGORIES= x11 devel 5CATEGORIES= x11 devel
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 6MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Base X libraries from modular Xorg X11 11COMMENT= Base X libraries from modular Xorg X11
12LICENSE= mit 12LICENSE= mit
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
@@ -29,26 +29,28 @@ CONFIGURE_ENV+= FILE_MAN_SUFFIX=5 @@ -29,26 +29,28 @@ CONFIGURE_ENV+= FILE_MAN_SUFFIX=5
29 29
30.if ${OPSYS} == "NetBSD" 30.if ${OPSYS} == "NetBSD"
31CONFIGURE_ARGS+= --disable-malloc0returnsnull 31CONFIGURE_ARGS+= --disable-malloc0returnsnull
32.endif 32.endif
33 33
34.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 34.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
35MAKE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include 35MAKE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
36.endif 36.endif
37 37
38CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h 38CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
39CPPFLAGS.MirBSD+= -pthread 39CPPFLAGS.MirBSD+= -pthread
40LDFLAGS.MirBSD+= -pthread 40LDFLAGS.MirBSD+= -pthread
41 41
 42BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1
 43
42.include "../../mk/compiler.mk" 44.include "../../mk/compiler.mk"
43 45
44.if !empty(PKGSRC_COMPILER:Mclang) 46.if !empty(PKGSRC_COMPILER:Mclang)
45BUILD_DEPENDS+= ucpp-[0-9]*:../../devel/ucpp 47BUILD_DEPENDS+= ucpp-[0-9]*:../../devel/ucpp
46CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix" 48CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
47.elif empty(PKGSRC_COMPILER:Mgcc) 49.elif empty(PKGSRC_COMPILER:Mgcc)
48CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" 50CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -"
49.endif 51.endif
50 52
51.include "../../x11/bigreqsproto/buildlink3.mk" 53.include "../../x11/bigreqsproto/buildlink3.mk"
52.include "../../x11/inputproto/buildlink3.mk" 54.include "../../x11/inputproto/buildlink3.mk"
53.include "../../x11/kbproto/buildlink3.mk" 55.include "../../x11/kbproto/buildlink3.mk"
54.include "../../x11/libXau/buildlink3.mk" 56.include "../../x11/libXau/buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/x11/libX11/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/libX11/PLIST 2010/09/10 20:28:03 1.8
+++ pkgsrc/x11/libX11/PLIST 2012/07/10 03:03:01 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.8 2010/09/10 20:28:03 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.9 2012/07/10 03:03:01 mef Exp $
2include/X11/ImUtil.h 2include/X11/ImUtil.h
3include/X11/XKBlib.h 3include/X11/XKBlib.h
4include/X11/Xcms.h 4include/X11/Xcms.h
5include/X11/Xlib-xcb.h 5include/X11/Xlib-xcb.h
6include/X11/Xlib.h 6include/X11/Xlib.h
7include/X11/XlibConf.h 7include/X11/XlibConf.h
8include/X11/Xlibint.h 8include/X11/Xlibint.h
9include/X11/Xlocale.h 9include/X11/Xlocale.h
10include/X11/Xregion.h 10include/X11/Xregion.h
11include/X11/Xresource.h 11include/X11/Xresource.h
12include/X11/Xutil.h 12include/X11/Xutil.h
13include/X11/cursorfont.h 13include/X11/cursorfont.h
14lib/X11/Xcms.txt 14lib/X11/Xcms.txt
@@ -122,26 +122,27 @@ man/man3/XCirculateRequestEvent.3 @@ -122,26 +122,27 @@ man/man3/XCirculateRequestEvent.3
122man/man3/XCirculateSubwindows.3 122man/man3/XCirculateSubwindows.3
123man/man3/XCirculateSubwindowsDown.3 123man/man3/XCirculateSubwindowsDown.3
124man/man3/XCirculateSubwindowsUp.3 124man/man3/XCirculateSubwindowsUp.3
125man/man3/XClassHint.3 125man/man3/XClassHint.3
126man/man3/XClearArea.3 126man/man3/XClearArea.3
127man/man3/XClearWindow.3 127man/man3/XClearWindow.3
128man/man3/XClientMessageEvent.3 128man/man3/XClientMessageEvent.3
129man/man3/XClipBox.3 129man/man3/XClipBox.3
130man/man3/XCloseDisplay.3 130man/man3/XCloseDisplay.3
131man/man3/XCloseIM.3 131man/man3/XCloseIM.3
132man/man3/XCloseOM.3 132man/man3/XCloseOM.3
133man/man3/XColor.3 133man/man3/XColor.3
134man/man3/XColormapEvent.3 134man/man3/XColormapEvent.3
 135man/man3/XCompose.3
135man/man3/XConfigureEvent.3 136man/man3/XConfigureEvent.3
136man/man3/XConfigureRequestEvent.3 137man/man3/XConfigureRequestEvent.3
137man/man3/XConfigureWindow.3 138man/man3/XConfigureWindow.3
138man/man3/XContextDependentDrawing.3 139man/man3/XContextDependentDrawing.3
139man/man3/XContextualDrawing.3 140man/man3/XContextualDrawing.3
140man/man3/XConvertCase.3 141man/man3/XConvertCase.3
141man/man3/XConvertSelection.3 142man/man3/XConvertSelection.3
142man/man3/XCopyArea.3 143man/man3/XCopyArea.3
143man/man3/XCopyColormapAndFree.3 144man/man3/XCopyColormapAndFree.3
144man/man3/XCopyGC.3 145man/man3/XCopyGC.3
145man/man3/XCopyPlane.3 146man/man3/XCopyPlane.3
146man/man3/XCreateBitmapFromData.3 147man/man3/XCreateBitmapFromData.3
147man/man3/XCreateColormap.3 148man/man3/XCreateColormap.3
@@ -222,27 +223,27 @@ man/man3/XFontsOfFontSet.3 @@ -222,27 +223,27 @@ man/man3/XFontsOfFontSet.3
222man/man3/XForceScreenSaver.3 223man/man3/XForceScreenSaver.3
223man/man3/XFree.3 224man/man3/XFree.3
224man/man3/XFreeColormap.3 225man/man3/XFreeColormap.3
225man/man3/XFreeColors.3 226man/man3/XFreeColors.3
226man/man3/XFreeCursor.3 227man/man3/XFreeCursor.3
227man/man3/XFreeEventData.3 228man/man3/XFreeEventData.3
228man/man3/XFreeExtensionList.3 229man/man3/XFreeExtensionList.3
229man/man3/XFreeFont.3 230man/man3/XFreeFont.3
230man/man3/XFreeFontInfo.3 231man/man3/XFreeFontInfo.3
231man/man3/XFreeFontNames.3 232man/man3/XFreeFontNames.3
232man/man3/XFreeFontPath.3 233man/man3/XFreeFontPath.3
233man/man3/XFreeFontSet.3 234man/man3/XFreeFontSet.3
234man/man3/XFreeGC.3 235man/man3/XFreeGC.3
235man/man3/XFreeModifierMap.3 236man/man3/XFreeModifiermap.3
236man/man3/XFreePixmap.3 237man/man3/XFreePixmap.3
237man/man3/XFreeStringList.3 238man/man3/XFreeStringList.3
238man/man3/XGCValues.3 239man/man3/XGCValues.3
239man/man3/XGContextFromGC.3 240man/man3/XGContextFromGC.3
240man/man3/XGenericEventCookie.3 241man/man3/XGenericEventCookie.3
241man/man3/XGetAtomName.3 242man/man3/XGetAtomName.3
242man/man3/XGetAtomNames.3 243man/man3/XGetAtomNames.3
243man/man3/XGetClassHint.3 244man/man3/XGetClassHint.3
244man/man3/XGetCommand.3 245man/man3/XGetCommand.3
245man/man3/XGetErrorDatabaseText.3 246man/man3/XGetErrorDatabaseText.3
246man/man3/XGetErrorText.3 247man/man3/XGetErrorText.3
247man/man3/XGetEventData.3 248man/man3/XGetEventData.3
248man/man3/XGetFontPath.3 249man/man3/XGetFontPath.3
@@ -825,27 +826,26 @@ man/man3/XwcDrawImageString.3 @@ -825,27 +826,26 @@ man/man3/XwcDrawImageString.3
825man/man3/XwcDrawString.3 826man/man3/XwcDrawString.3
826man/man3/XwcDrawText.3 827man/man3/XwcDrawText.3
827man/man3/XwcFreeStringList.3 828man/man3/XwcFreeStringList.3
828man/man3/XwcLookupString.3 829man/man3/XwcLookupString.3
829man/man3/XwcResetIC.3 830man/man3/XwcResetIC.3
830man/man3/XwcTextEscapement.3 831man/man3/XwcTextEscapement.3
831man/man3/XwcTextExtents.3 832man/man3/XwcTextExtents.3
832man/man3/XwcTextListToTextProperty.3 833man/man3/XwcTextListToTextProperty.3
833man/man3/XwcTextPerCharExtents.3 834man/man3/XwcTextPerCharExtents.3
834man/man3/XwcTextPropertyToTextList.3 835man/man3/XwcTextPropertyToTextList.3
835man/man5/Compose.5 836man/man5/Compose.5
836man/man5/XCompose.5 837man/man5/XCompose.5
837share/X11/XErrorDB 838share/X11/XErrorDB
838share/X11/XKeysymDB 
839share/X11/locale/C/Compose 839share/X11/locale/C/Compose
840share/X11/locale/C/XI18N_OBJS 840share/X11/locale/C/XI18N_OBJS
841share/X11/locale/C/XLC_LOCALE 841share/X11/locale/C/XLC_LOCALE
842share/X11/locale/am_ET.UTF-8/Compose 842share/X11/locale/am_ET.UTF-8/Compose
843share/X11/locale/am_ET.UTF-8/XI18N_OBJS 843share/X11/locale/am_ET.UTF-8/XI18N_OBJS
844share/X11/locale/am_ET.UTF-8/XLC_LOCALE 844share/X11/locale/am_ET.UTF-8/XLC_LOCALE
845share/X11/locale/armscii-8/Compose 845share/X11/locale/armscii-8/Compose
846share/X11/locale/armscii-8/XI18N_OBJS 846share/X11/locale/armscii-8/XI18N_OBJS
847share/X11/locale/armscii-8/XLC_LOCALE 847share/X11/locale/armscii-8/XLC_LOCALE
848share/X11/locale/compose.dir 848share/X11/locale/compose.dir
849share/X11/locale/el_GR.UTF-8/Compose 849share/X11/locale/el_GR.UTF-8/Compose
850share/X11/locale/el_GR.UTF-8/XI18N_OBJS 850share/X11/locale/el_GR.UTF-8/XI18N_OBJS
851share/X11/locale/el_GR.UTF-8/XLC_LOCALE 851share/X11/locale/el_GR.UTF-8/XLC_LOCALE
cvs diff -r1.18 -r1.19 pkgsrc/x11/libX11/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/libX11/distinfo 2011/09/15 19:50:14 1.18
+++ pkgsrc/x11/libX11/distinfo 2012/07/10 03:03:01 1.19
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.18 2011/09/15 19:50:14 bsiegert Exp $ 1$NetBSD: distinfo,v 1.19 2012/07/10 03:03:01 mef Exp $
2 2
3SHA1 (libX11-1.3.5.tar.bz2) = c5dda2b6279f3e3267646576138fcd091a7f3c54 3SHA1 (libX11-1.5.0.tar.bz2) = 8177535c9c59d8c3ab98d55ce53520b5737ccd1a
4RMD160 (libX11-1.3.5.tar.bz2) = 84544006514eec6f37b642b294ea5f3658b52934 4RMD160 (libX11-1.5.0.tar.bz2) = 53873128000cb6827941ee81cb005f5b730a7940
5Size (libX11-1.3.5.tar.bz2) = 2104595 bytes 5Size (libX11-1.5.0.tar.bz2) = 2322265 bytes
6SHA1 (patch-aa) = 553d0905e16f8e17e746d79761709c11c4fa3d55 6SHA1 (patch-aa) = ed69aa016d58e46fa9349778852264e3e1975135
7SHA1 (patch-ac) = 06d4b2c34d8fa39bddbc1ce625e0dc344e5dea7e 7SHA1 (patch-ac) = 5d73fc6b7544f8be7a988f0fd5cb17dd84b25896
cvs diff -r1.9 -r1.10 pkgsrc/x11/libX11/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/libX11/patches/Attic/patch-aa 2011/09/15 19:50:14 1.9
+++ pkgsrc/x11/libX11/patches/Attic/patch-aa 2012/07/10 03:03:01 1.10
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-aa,v 1.9 2011/09/15 19:50:14 bsiegert Exp $ 1$NetBSD: patch-aa,v 1.10 2012/07/10 03:03:01 mef Exp $
2 2
3Include pthread.h as thread stubs might be macros like on NetBSD. 3Include pthread.h as thread stubs might be macros like on NetBSD.
4 4
5Define conditional for cross-compiling support. 5Define conditional for cross-compiling support.
6 6
7Also, don't look for keysmydef.h, as this could break cross 7Also, don't look for keysmydef.h, as this could break cross
8builds (from GIT). 8builds (from GIT).
9 9
10--- configure.ac.orig Wed Aug 11 23:23:48 2010 10--- configure.ac.orig 2012-06-02 15:37:17.000000000 +0900
11+++ configure.ac 11+++ configure.ac 2012-06-28 19:14:45.000000000 +0900
12@@ -315,7 +315,7 @@ xyes) 12@@ -277,7 +277,7 @@
13 ;; 13 ;;
14 esac 14 esac
15  15
16-AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"]) 16-AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"])
17+AC_CHECK_DECLS([pthread_self], [thrstubs="no"], [thrstubs="yes"], [[#include <pthread.h>]]) 17+AC_CHECK_DECLS([pthread_self], [thrstubs="no"], [thrstubs="yes"], [[#include <pthread.h>]])
18 AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes) 18 AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
19  19
20 dnl XXX incomplete, please fill this in 20 # XXX incomplete, please fill this in
21@@ -324,12 +324,12 @@ if test x$xthreads = xyes ; then 21@@ -286,12 +286,12 @@
22 linux*|openbsd*|gnu*|k*bsd*-gnu) 22 linux*|gnu*|k*bsd*-gnu)
23 XTHREADLIB=-lpthread ;; 23 XTHREADLIB=-lpthread ;;
24 netbsd*) 24 netbsd*)
25- XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS" 25- XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
26- XTHREADLIB="-lpthread" ;; 26- XTHREADLIB="-lpthread" ;;
27+ XTHREAD_CFLAGS="-D_REENTRANT" 27+ XTHREAD_CFLAGS="-D_REENTRANT"
28+ XTHREADLIB="-pthread" ;; 28+ XTHREADLIB="-pthread" ;;
29 freebsd*) 29 freebsd*)
30 XTHREAD_CFLAGS="-D_THREAD_SAFE" 30 XTHREAD_CFLAGS="-D_THREAD_SAFE"
31 XTHREADLIB="-pthread" ;; 31 XTHREADLIB="-pthread" ;;
32- dragonfly*) 32- dragonfly*|openbsd*)
33+ dragonfly*|mirbsd*) 33+ dragonfly*|openbsd*|mirbsd*)
34 XTHREADLIB="-pthread" ;; 34 XTHREADLIB="-pthread" ;;
35 solaris*) 35 solaris*)
36 XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;; 36 XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
cvs diff -r1.11 -r1.12 pkgsrc/x11/libX11/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/libX11/patches/Attic/patch-ac 2011/09/15 19:50:14 1.11
+++ pkgsrc/x11/libX11/patches/Attic/patch-ac 2012/07/10 03:03:01 1.12
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-ac,v 1.11 2011/09/15 19:50:14 bsiegert Exp $ 1$NetBSD: patch-ac,v 1.12 2012/07/10 03:03:01 mef Exp $
2 2
3See patch-aa. 3See patch-aa.
4 4
5--- configure.orig Wed Jul 27 08:46:21 2011 5--- configure.orig 2012-06-02 15:37:31.000000000 +0900
6+++ configure 6+++ configure 2012-06-28 19:20:03.000000000 +0900
7@@ -14431,43 +14431,18 @@ $as_echo "#define XUSE_MTSAFE_API 1" >>c 7@@ -19942,43 +19942,18 @@
8 ;; 8 ;;
9 esac 9 esac
10  10
11-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5 11-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5
12-$as_echo_n "checking for pthread_self in -lc... " >&6; } 12-$as_echo_n "checking for pthread_self in -lc... " >&6; }
13-if test "${ac_cv_lib_c_pthread_self+set}" = set; then : 13-if ${ac_cv_lib_c_pthread_self+:} false; then :
14- $as_echo_n "(cached) " >&6 14- $as_echo_n "(cached) " >&6
15+ac_fn_c_check_decl "$LINENO" "pthread_self" "ac_cv_have_decl_pthread_self" "#include <pthread.h> 15+ac_fn_c_check_decl "$LINENO" "pthread_self" "ac_cv_have_decl_pthread_self" "#include <pthread.h>
16+" 16+"
17+if test "x$ac_cv_have_decl_pthread_self" = x""yes; then : 17+if test "x$ac_cv_have_decl_pthread_self" = xyes; then :
18+ ac_have_decl=1 18+ ac_have_decl=1
19 else 19 else
20- ac_check_lib_save_LIBS=$LIBS 20- ac_check_lib_save_LIBS=$LIBS
21-LIBS="-lc $LIBS" 21-LIBS="-lc $LIBS"
22-cat confdefs.h - <<_ACEOF >conftest.$ac_ext 22-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23-/* end confdefs.h. */ 23-/* end confdefs.h. */
24+ ac_have_decl=0 24+ ac_have_decl=0
25+fi 25+fi
26  26
27-/* Override any GCC internal prototype to avoid an error. 27-/* Override any GCC internal prototype to avoid an error.
28- Use char because int might match the return type of a GCC 28- Use char because int might match the return type of a GCC
29- builtin and then its argument prototype would still apply. */ 29- builtin and then its argument prototype would still apply. */
30-#ifdef __cplusplus 30-#ifdef __cplusplus
@@ -42,34 +42,34 @@ See patch-aa. @@ -42,34 +42,34 @@ See patch-aa.
42+#define HAVE_DECL_PTHREAD_SELF $ac_have_decl 42+#define HAVE_DECL_PTHREAD_SELF $ac_have_decl
43 _ACEOF 43 _ACEOF
44-if ac_fn_c_try_link "$LINENO"; then : 44-if ac_fn_c_try_link "$LINENO"; then :
45- ac_cv_lib_c_pthread_self=yes 45- ac_cv_lib_c_pthread_self=yes
46-else 46-else
47- ac_cv_lib_c_pthread_self=no 47- ac_cv_lib_c_pthread_self=no
48-fi 48-fi
49-rm -f core conftest.err conftest.$ac_objext \ 49-rm -f core conftest.err conftest.$ac_objext \
50- conftest$ac_exeext conftest.$ac_ext 50- conftest$ac_exeext conftest.$ac_ext
51-LIBS=$ac_check_lib_save_LIBS 51-LIBS=$ac_check_lib_save_LIBS
52-fi 52-fi
53-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5 53-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5
54-$as_echo "$ac_cv_lib_c_pthread_self" >&6; } 54-$as_echo "$ac_cv_lib_c_pthread_self" >&6; }
55-if test "x$ac_cv_lib_c_pthread_self" = x""yes; then : 55-if test "x$ac_cv_lib_c_pthread_self" = xyes; then :
56+if test $ac_have_decl = 1; then : 56+if test $ac_have_decl = 1; then :
57 thrstubs="no" 57 thrstubs="no"
58 else 58 else
59 thrstubs="yes" 59 thrstubs="yes"
60@@ -14487,12 +14462,12 @@ if test x$xthreads = xyes ; then 60@@ -19999,12 +19974,12 @@
61 linux*|openbsd*|gnu*|k*bsd*-gnu) 61 linux*|gnu*|k*bsd*-gnu)
62 XTHREADLIB=-lpthread ;; 62 XTHREADLIB=-lpthread ;;
63 netbsd*) 63 netbsd*)
64- XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS" 64- XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
65- XTHREADLIB="-lpthread" ;; 65- XTHREADLIB="-lpthread" ;;
66+ XTHREAD_CFLAGS="-D_REENTRANT" 66+ XTHREAD_CFLAGS="-D_REENTRANT"
67+ XTHREADLIB="-pthread" ;; 67+ XTHREADLIB="-pthread" ;;
68 freebsd*) 68 freebsd*)
69 XTHREAD_CFLAGS="-D_THREAD_SAFE" 69 XTHREAD_CFLAGS="-D_THREAD_SAFE"
70 XTHREADLIB="-pthread" ;; 70 XTHREADLIB="-pthread" ;;
71- dragonfly*) 71- dragonfly*|openbsd*)
72+ dragonfly*|mirbsd*) 72+ dragonfly*|openbsd*|mirbsd*)
73 XTHREADLIB="-pthread" ;; 73 XTHREADLIB="-pthread" ;;
74 solaris*) 74 solaris*)
75 XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;; 75 XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;