summaryrefslogtreecommitdiff
path: root/pkgtools/libnbcompat
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-10-24 11:18:33 +0000
committergrant <grant@pkgsrc.org>2004-10-24 11:18:33 +0000
commit92f150c93f7fea2b8aa516e7bc89bc9df6dcacab (patch)
tree7fd70f1441fd69478e021130c27ccbbca028a93b /pkgtools/libnbcompat
parent35ca82ab5cd0d75eabb5967940b519d60e96c5b8 (diff)
downloadpkgsrc-92f150c93f7fea2b8aa516e7bc89bc9df6dcacab.tar.gz
fix detection of poll() for Darwin 7.x which has a poll()
compatibility function, but none of the required headers. fixes bootstrap on Darwin 7.5.0 with gcc and xlc.
Diffstat (limited to 'pkgtools/libnbcompat')
-rw-r--r--pkgtools/libnbcompat/Makefile4
-rwxr-xr-xpkgtools/libnbcompat/files/configure4
-rw-r--r--pkgtools/libnbcompat/files/configure.ac6
3 files changed, 9 insertions, 5 deletions
diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile
index c98d04a8498..ff0d72674f5 100644
--- a/pkgtools/libnbcompat/Makefile
+++ b/pkgtools/libnbcompat/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.42 2004/09/23 15:57:40 reed Exp $
+# $NetBSD: Makefile,v 1.43 2004/10/24 11:18:33 grant Exp $
#
# NOTE: If you update this package, it is *mandatory* that you update
# pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
# list of tested and supported platforms.
#
-DISTNAME= libnbcompat-20040911
+DISTNAME= libnbcompat-20041024
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/libnbcompat/files/configure b/pkgtools/libnbcompat/files/configure
index 11b3812e4af..932096286a0 100755
--- a/pkgtools/libnbcompat/files/configure
+++ b/pkgtools/libnbcompat/files/configure
@@ -9660,7 +9660,9 @@ done
pkg_use_nbcompat_poll=yes
if test $pkg_cv_have_poll_h = yes; then
pkg_use_nbcompat_poll=no
-else
+fi
+
+if test $pkg_cv_have_poll_h = yes -o test $pkg_cv_have_sys_poll_h = yes; then
echo "$as_me:$LINENO: checking for poll" >&5
echo $ECHO_N "checking for poll... $ECHO_C" >&6
if test "${ac_cv_func_poll+set}" = set; then
diff --git a/pkgtools/libnbcompat/files/configure.ac b/pkgtools/libnbcompat/files/configure.ac
index af03faff8f9..06311b119e0 100644
--- a/pkgtools/libnbcompat/files/configure.ac
+++ b/pkgtools/libnbcompat/files/configure.ac
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.50 2004/09/11 19:01:40 jlam Exp $
+dnl $NetBSD: configure.ac,v 1.51 2004/10/24 11:18:33 grant Exp $
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
@@ -259,7 +259,9 @@ AC_CHECK_HEADERS([poll.h sys/poll.h], [pkg_cv_have_poll_h=yes])
pkg_use_nbcompat_poll=yes
if test $pkg_cv_have_poll_h = yes; then
pkg_use_nbcompat_poll=no
-else
+fi
+
+if test $pkg_cv_have_poll_h = yes -o test $pkg_cv_have_sys_poll_h = yes; then
AC_CHECK_FUNC(poll, [
AC_MSG_TRY_COMPILE([if poll() is implemented natively],
pkg_cv_native_poll,