Module Name: src
Committed By: christos
Date: Tue Dec 14 23:17:21 UTC 2010
Modified Files:
src/external/bsd/bind: Makefile.inc
Log Message:
Handle NetBSD-5 and 4 lack of atomics by disabling threads.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.6 src/external/bsd/bind/Makefile.inc:1.7
--- src/external/bsd/bind/Makefile.inc:1.6 Sat Nov 6 17:32:49 2010
+++ src/external/bsd/bind/Makefile.inc Tue Dec 14 18:17:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2010/11/06 21:32:49 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2010/12/14 23:17:20 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -17,7 +17,11 @@
NAMED_USE_OPENSSL?=yes
.endif
+.if exists(/usr/include/sys/atomic.h)
NAMED_USE_PTHREADS?=yes
+.else
+NAMED_USE_PTHREADS?=no
+.endif
IDIST= ${NETBSDSRCDIR}/external/bsd/bind/dist
BIND_SRCDIR= ${NETBSDSRCDIR}/external/bsd/bind
@@ -89,7 +93,11 @@
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
.else
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypt)
+.else
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/lib/libcrypto
+.endif
.endif
.endif
