diff options
Diffstat (limited to 'x11/xproto/patches/patch-ab')
| -rw-r--r-- | x11/xproto/patches/patch-ab | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/x11/xproto/patches/patch-ab b/x11/xproto/patches/patch-ab index 09c50130eae..87afb584463 100644 --- a/x11/xproto/patches/patch-ab +++ b/x11/xproto/patches/patch-ab @@ -1,16 +1,16 @@ -$NetBSD: patch-ab,v 1.3 2009/03/06 10:28:32 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2010/09/10 20:07:29 joerg Exp $ ---- configure.ac.orig 2009-03-02 17:54:21.000000000 +0000 +--- configure.ac.orig 2010-08-10 14:19:17.000000000 +0000 +++ configure.ac -@@ -4,6 +4,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) +@@ -11,6 +11,7 @@ XORG_DEFAULT_OPTIONS AC_CONFIG_HEADER([do-not-use-config.h]) AC_CONFIG_HEADER([Xfuncproto.h]) +AC_CONFIG_HEADER([Xos_r.h]) - # Require xorg-macros: XORG_CHANGELOG - m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -@@ -200,6 +201,15 @@ if test "x$WIDEPROTO" = xno; then + AC_CANONICAL_HOST + +@@ -203,6 +204,14 @@ if test "x$WIDEPROTO" = xno; then AC_DEFINE(NARROWPROTO, [], [Narrow prototypes]) fi @@ -22,7 +22,6 @@ $NetBSD: patch-ab,v 1.3 2009/03/06 10:28:32 wiz Exp $ +AC_CHECK_FUNC(strtok_r, [AC_DEFINE(_XOS_R_H_MTSAFE_STRINGAPI,[],[Assume has strtok_r from string.h])],) +AC_CHECK_FUNC(gmtime_r, [AC_DEFINE(_XOS_R_H_MTSAFE_TIMEAPI,[],[Assume has gmtime_r and friends from time.h])],) +AC_CHECK_FUNC(ttyname_r, [AC_DEFINE(_XOS_R_H_MTSAFE_UNISTDAPI,[],[Assume has ttyname_r and friends from unistd.h])],) -+ - XORG_RELEASE_VERSION - XORG_CHANGELOG + AC_OUTPUT([Makefile + Xpoll.h |