From 64210eb246da2f58ee93e68feb3b16e206b8d28f Mon Sep 17 00:00:00 2001
From: "dmose%netscape.com" <dmose%netscape.com>
Date: Thu, 13 Jun 2002 22:02:08 +0000
Subject: [PATCH] NetBSD build-system fix (bug 135027); r=seawood@netscape.com

---
 directory/c-sdk/build.mk                                | 2 +-
 directory/c-sdk/ldap/libraries/libldap/Makefile.in      | 6 +++++-
 directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/directory/c-sdk/build.mk b/directory/c-sdk/build.mk
index 143e81fe699..b1fe575c3a6 100644
--- a/directory/c-sdk/build.mk
+++ b/directory/c-sdk/build.mk
@@ -391,7 +391,7 @@ ifeq ($(OS_ARCH), OSF1)
 SO_FILES_TO_REMOVE=so_locations
 endif
 
-ifneq (,$(filter BeOS Darwin,$(OS_ARCH)))
+ifneq (,$(filter BeOS Darwin NetBSD,$(OS_ARCH)))
 LINK_DLL	= $(MKSHLIB) $(OBJS)
 endif
 
diff --git a/directory/c-sdk/ldap/libraries/libldap/Makefile.in b/directory/c-sdk/ldap/libraries/libldap/Makefile.in
index 5781a03a276..d9bc43e5d6b 100644
--- a/directory/c-sdk/ldap/libraries/libldap/Makefile.in
+++ b/directory/c-sdk/ldap/libraries/libldap/Makefile.in
@@ -213,6 +213,10 @@ ifeq ($(OS_ARCH), BeOS)
 EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
 endif
 
+ifeq ($(OS_ARCH), NetBSD)
+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
+endif
+
 ###########################################################################
 
 ifeq ($(USE_DLL_EXPORTS_FILE), 1)
@@ -257,7 +261,7 @@ $(LIBLDAP): $(OBJS) $(LIBDIR) $(LDAP_EXPORT_DEFS) $(DEF_FILE)
 ifdef SO_FILES_TO_REMOVE
 	-$(RM) $(SO_FILES_TO_REMOVE)
 endif
-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX, $(OS_ARCH)))
+ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD, $(OS_ARCH)))
 	$(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
 else
 ifeq ($(OS_ARCH),OS2)
diff --git a/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c b/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
index 1c595380f52..f9a8c9b48aa 100644
--- a/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
+++ b/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
@@ -173,7 +173,7 @@ struct prldap_errormap_entry {
 #define ETXTBSY         -1
 #endif
 
-#if defined(BSDI) || defined(OPENBSD)
+#if defined(BSDI) || defined(OPENBSD) || defined (NETBSD)
 #define ENOTSUP		-1
 #endif
 
@@ -183,7 +183,7 @@ struct prldap_errormap_entry {
 
 #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \
   defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \
-  defined(OPENBSD)
+  defined(OPENBSD) || defined(NETBSD)
 #define EDEADLOCK       -1
 #endif