support MKCRYPTO==no. approved by lukem.

This commit is contained in:
mrg 2008-08-31 10:29:51 +00:00
parent 95f8e591aa
commit da81ae230b
3 changed files with 13 additions and 3 deletions

View File

@ -745,8 +745,10 @@
/* Define to 1 if you have the `thr_yield' function. */ /* Define to 1 if you have the `thr_yield' function. */
/* #undef HAVE_THR_YIELD */ /* #undef HAVE_THR_YIELD */
#if 0 /* Define this in the Makefile */
/* define if you have TLS */ /* define if you have TLS */
#define HAVE_TLS 1 #define HAVE_TLS 1
#endif
/* Define to 1 if you have the <unicode/utypes.h> header file. */ /* Define to 1 if you have the <unicode/utypes.h> header file. */
/* #undef HAVE_UNICODE_UTYPES_H */ /* #undef HAVE_UNICODE_UTYPES_H */

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.libldap,v 1.2 2008/08/13 04:44:04 lukem Exp $ # $NetBSD: Makefile.libldap,v 1.3 2008/08/31 10:29:51 mrg Exp $
.include "../../openldap.mk" .include "../../openldap.mk"
@ -13,10 +13,14 @@ SRCS+= bind.c open.c result.c error.c compare.c search.c \
getdn.c getentry.c getattr.c getvalues.c addentry.c \ getdn.c getentry.c getattr.c getvalues.c addentry.c \
request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \ request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
init.c options.c print.c string.c util-int.c schema.c \ init.c options.c print.c string.c util-int.c schema.c \
charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
assertion.c assertion.c
.if ${MKCRYPTO} != "no"
SRCS+= tls.c
.endif
CPPFLAGS+= -DLDAP_LIBRARY CPPFLAGS+= -DLDAP_LIBRARY
LIBDPLIBS+= lber ${.CURDIR}/../liblber LIBDPLIBS+= lber ${.CURDIR}/../liblber

View File

@ -1,4 +1,4 @@
# $NetBSD: openldap.mk,v 1.2 2008/08/13 04:42:47 lukem Exp $ # $NetBSD: openldap.mk,v 1.3 2008/08/31 10:29:51 mrg Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -25,3 +25,7 @@ LDAPLIB.${_LIB}= ${LDAPOBJDIR.${_LIB}}/lib${_LIB}.a
.endfor .endfor
LDAP_MKVERSION= ${HOST_SH} ${LDAP_DISTDIR}/build/mkversion -v "${LDAP_VERSION}" LDAP_MKVERSION= ${HOST_SH} ${LDAP_DISTDIR}/build/mkversion -v "${LDAP_VERSION}"
.if ${MKCRYPTO} != "no"
CPPFLAGS+= -DHAVE_TLS
.endif