Added patches from <tih@athene.nhh.no> to resolve NetBSD build problems.

diff --git a/include/Make-template b/include/Make-template
index c0a26fb6296646fa688364490f21abc05f1c6b69..8244b1a630b7847344dede780c684a9a4859a989 100644 (file)
--- a/include/Make-template
+++ b/include/Make-template
@@ -31,17 +31,25 @@ ldapconfig.h:       ldapconfig.h.edit Makefile
         echo " * INSTALL file for more information." >> $@; \
         echo " */ " >> $@; \
         echo "" >> $@; \
-       $(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' ldapconfig.h.edit >> $@; \
+       $(SED) -e 's;%ETCDIR%;$(LDAP_ETCDIR);' \
+                       -e 's;%BINDIR%;$(LDAP_BINDIR);' \
+                       -e 's;%SBINDIR%;$(LDAP_SBINDIR);' \
+                       -e 's;%LIBEXECDIR%;$(LDAP_LIBEXECDIR);' \
+                       -e 's;%RUNDIR%;$(LDAP_RUNDIR);' \
+                       -e 's;%EDITOR%;$(LDAP_EDITOR);' \
+                       -e 's;%FINGER%;$(LDAP_FINGER);' \
+                       -e 's;%SENDMAIL%;$(LDAP_SENDMAIL);' \
+                        ldapconfig.h.edit >> $@; \
        $(CHMOD) 444 $@
 
 install: all FORCE
-               -$(MKDIR) -p $(INCLUDEDIR)
-               $(INSTALL) $(INSTALLFLAGS) -m 644 ldap.h $(INCLUDEDIR)
-               $(INSTALL) $(INSTALLFLAGS) -m 644 lber.h $(INCLUDEDIR)
-               $(INSTALL) $(INSTALLFLAGS) -m 644 proto-lber.h $(INCLUDEDIR)
-               $(INSTALL) $(INSTALLFLAGS) -m 644 proto-ldap.h $(INCLUDEDIR)
-               $(INSTALL) $(INSTALLFLAGS) -m 644 disptmpl.h $(INCLUDEDIR)
-               $(INSTALL) $(INSTALLFLAGS) -m 644 srchpref.h $(INCLUDEDIR)
+               -$(MKDIR) -p $(LDAP_INCDIR)
+               $(INSTALL) $(INSTALLFLAGS) -m 644 ldap.h $(LDAP_INCDIR)
+               $(INSTALL) $(INSTALLFLAGS) -m 644 lber.h $(LDAP_INCDIR)
+               $(INSTALL) $(INSTALLFLAGS) -m 644 proto-lber.h $(LDAP_INCDIR)
+               $(INSTALL) $(INSTALLFLAGS) -m 644 proto-ldap.h $(LDAP_INCDIR)
+               $(INSTALL) $(INSTALLFLAGS) -m 644 disptmpl.h $(LDAP_INCDIR)
+               $(INSTALL) $(INSTALLFLAGS) -m 644 srchpref.h $(LDAP_INCDIR)
 
 depend:        FORCE
 

diff --git a/include/portable.h b/include/portable.h
index a91b27a5d554e0e53fb682a021d43b76ca74e849..808d0c023767adde601912133e6007de186d3f7d 100644 (file)
--- a/include/portable.h
+++ b/include/portable.h
@@ -61,9 +61,9 @@
 #endif
 
 /*
- * on many systems, we should use waitpid() instead of waitN()
+ * on most systems, we should use waitpid() instead of waitN()
  */
-#if !defined( USE_WAITPID ) && ( defined( SYSV ) || defined( sunos4 ) || defined( ultrix ) || defined( aix ))
+#if !defined( USE_WAITPID ) && !defined( nextstep )
 #define USE_WAITPID
 #endif
 
@@ -101,7 +101,7 @@
  * some systems don't have the BSD re_comp and re_exec routines
  */
 #ifndef NEED_BSDREGEX
-#if defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( freebsd ) || defined( linux )
+#if defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( linux )
 #define NEED_BSDREGEX
 #endif
 #endif
@@ -120,7 +120,8 @@
  * Are sys_errlist and sys_nerr declared in stdio.h?
  */
 #ifndef SYSERRLIST_IN_STDIO
-#if defined( freebsd ) 
+#if defined( freebsd ) || defined( netbsd ) || \
+       defined( __GLIBC__ ) && ( __GLIBC__ > 1 )
 #define SYSERRLIST_IN_STDIO
 #endif
 #endif
@@ -170,7 +171,7 @@
  * call signal or sigset (signal does not block the signal while
  * in the handler on sys v and sigset does not exist on bsd)
  */
-#ifdef SYSV
+#if defined(SYSV) && !defined(linux)
 #define SIGNAL sigset
 #else
 #define SIGNAL signal