Upgraded to version 1.239

Submitted by:	Thomas Sandford
PR:		ports/82841
Approved by:	nectar (mentor,maintainer)

4 files changed, 124 insertions, 236 deletions

diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index cd5cc64d06ec..9ac46492ea6e 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	nss_ldap
 PORTVERSION=	1.${NSS_LDAP_VERSION}
-PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.padl.com/download/
 DISTNAME=	${PORTNAME}-${NSS_LDAP_VERSION}
@@ -17,9 +16,10 @@ COMMENT=	RFC 2307 NSS module
 
 USE_OPENLDAP=	yes
 
-NSS_LDAP_VERSION=204
+NSS_LDAP_VERSION=239
 
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
diff --git a/net/nss_ldap/distinfo b/net/nss_ldap/distinfo
index 31eae7d93ae5..068a8a388171 100644
--- a/net/nss_ldap/distinfo
+++ b/net/nss_ldap/distinfo
@@ -1,2 +1,2 @@
-MD5 (nss_ldap-204.tar.gz) = 842af173f8dc1efdd7750bca00efbc5e
-SIZE (nss_ldap-204.tar.gz) = 220878
+MD5 (nss_ldap-239.tar.gz) = e30e3a3035e75933cd1a0acdeded1394
+SIZE (nss_ldap-239.tar.gz) = 222276
diff --git a/net/nss_ldap/files/patch-Makefile.in b/net/nss_ldap/files/patch-Makefile.in
index 903d3ff10e31..662144f00bfb 100644
--- a/net/nss_ldap/files/patch-Makefile.in
+++ b/net/nss_ldap/files/patch-Makefile.in
@@ -1,127 +1,91 @@
---- Makefile.in.orig	Fri Feb 14 17:19:03 2003
-+++ Makefile.in	Wed Apr 16 19:38:50 2003
-@@ -99,16 +99,18 @@
- 	     ldap.conf nss_ldap.spec nsswitch.ldap 
+--- Makefile.in.orig	Thu Jun 30 15:32:54 2005
++++ Makefile.in	Thu Jun 30 16:00:29 2005
+@@ -82,7 +82,12 @@
  
+ man_MANS = nss_ldap.5
  
--nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c \
--	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c \
--	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \
--	ldap-bp.c util.c globals.c ltf.c snprintf.c resolve.c \
--	dnsconfig.c irs-nss.c sasl.c pagectrl.c
+-nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c 	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c 	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c 	ldap-bp.c util.c ltf.c snprintf.c resolve.c 	dnsconfig.c irs-nss.c pagectrl.c
 +nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c \
 +	\
 +	ldap-schema.c \
-+	util.c globals.c ltf.c snprintf.c resolve.c \
-+	dnsconfig.c irs-nss.c sasl.c pagectrl.c \
++	util.c ltf.c snprintf.c resolve.c \
++ 	dnsconfig.c irs-nss.c pagectrl.c \
 +	bsdnss.c
  
  
--NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-netgrp.c ldap-schema.c \
-+NSS_LDAP_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-schema.c \
- 	util.c globals.c ltf.c snprintf.c resolve.c dnsconfig.c \
--	irs-nss.c sasl.c pagectrl.c aix_authmeth.c
-+	irs-nss.c sasl.c pagectrl.c aix_authmeth.c \
-+	bsdnss.c
+ nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@
+@@ -90,7 +95,10 @@
+ NSS_LDAP_PATH_CONF = @NSS_LDAP_PATH_CONF@
+ NSS_LDAP_PATH_ROOTPASSWD = @NSS_LDAP_PATH_ROOTPASSWD@
  
- DEFS = @DEFS@
+-NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-netgrp.c ldap-schema.c 	util.c ltf.c snprintf.c resolve.c dnsconfig.c 	irs-nss.c pagectrl.c aix_authmeth.c
++NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-schema.c \
++ 	util.c ltf.c snprintf.c resolve.c dnsconfig.c \
++ 	irs-nss.c pagectrl.c aix_authmeth.c \
++	bsdnss.c
  
-@@ -134,23 +136,23 @@
- PROGRAMS = $(noinst_PROGRAMS)
  
- am_NSS_LDAP_OBJECTS = ldap-nss.$(OBJEXT) ldap-grp.$(OBJEXT) \
--	ldap-pwd.$(OBJEXT) ldap-netgrp.$(OBJEXT) ldap-schema.$(OBJEXT) \
-+	ldap-pwd.$(OBJEXT) ldap-schema.$(OBJEXT) \
- 	util.$(OBJEXT) globals.$(OBJEXT) ltf.$(OBJEXT) \
- 	snprintf.$(OBJEXT) resolve.$(OBJEXT) dnsconfig.$(OBJEXT) \
- 	irs-nss.$(OBJEXT) sasl.$(OBJEXT) pagectrl.$(OBJEXT) \
--	aix_authmeth.$(OBJEXT)
-+	aix_authmeth.$(OBJEXT) bsdnss.$(OBJEXT)
- NSS_LDAP_OBJECTS = $(am_NSS_LDAP_OBJECTS)
- NSS_LDAP_LDADD = $(LDADD)
- NSS_LDAP_DEPENDENCIES =
--am_nss_ldap_so_OBJECTS = ldap-nss.$(OBJEXT) ldap-pwd.$(OBJEXT) \
--	ldap-grp.$(OBJEXT) ldap-netgrp.$(OBJEXT) ldap-rpc.$(OBJEXT) \
--	ldap-hosts.$(OBJEXT) ldap-network.$(OBJEXT) \
--	ldap-proto.$(OBJEXT) ldap-spwd.$(OBJEXT) ldap-alias.$(OBJEXT) \
--	ldap-service.$(OBJEXT) ldap-schema.$(OBJEXT) \
--	ldap-ethers.$(OBJEXT) ldap-bp.$(OBJEXT) util.$(OBJEXT) \
-+am_nss_ldap_so_OBJECTS = ldap-nss.$(OBJEXT) \
-+	ldap-grp.$(OBJEXT) \
-+	ldap-pwd.$(OBJEXT) \
+ NSS_LDAP_LDFLAGS = @NSS_LDAP_LDFLAGS@
+@@ -118,15 +126,17 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-nss_ldap_so_OBJECTS =  ldap-nss.o ldap-pwd.o ldap-grp.o ldap-netgrp.o \
+-ldap-rpc.o ldap-hosts.o ldap-network.o ldap-proto.o ldap-spwd.o \
+-ldap-alias.o ldap-service.o ldap-schema.o ldap-ethers.o ldap-bp.o \
+-util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o pagectrl.o
++nss_ldap_so_OBJECTS =  ldap-nss.o ldap-pwd.o ldap-grp.o \
 +	\
-+	ldap-schema.$(OBJEXT) \
-+	util.$(OBJEXT) \
- 	globals.$(OBJEXT) ltf.$(OBJEXT) snprintf.$(OBJEXT) \
- 	resolve.$(OBJEXT) dnsconfig.$(OBJEXT) irs-nss.$(OBJEXT) \
--	sasl.$(OBJEXT) pagectrl.$(OBJEXT)
-+	sasl.$(OBJEXT) pagectrl.$(OBJEXT) bsdnss.$(OBJEXT)
- nss_ldap_so_OBJECTS = $(am_nss_ldap_so_OBJECTS)
++	ldap-schema.o \
++	util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o pagectrl.o \
++	bsdnss.o
  nss_ldap_so_LDADD = $(LDADD)
- nss_ldap_so_DEPENDENCIES =
-@@ -162,15 +164,15 @@
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aix_authmeth.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/dnsconfig.Po ./$(DEPDIR)/globals.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/irs-nss.Po ./$(DEPDIR)/ldap-alias.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ldap-bp.Po ./$(DEPDIR)/ldap-ethers.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ldap-grp.Po ./$(DEPDIR)/ldap-hosts.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ldap-netgrp.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ldap-network.Po ./$(DEPDIR)/ldap-nss.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ldap-proto.Po ./$(DEPDIR)/ldap-pwd.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ldap-rpc.Po ./$(DEPDIR)/ldap-schema.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ldap-service.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ldap-spwd.Po ./$(DEPDIR)/ltf.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/irs-nss.Po \
-+@AMDEP_TRUE@	\
-+@AMDEP_TRUE@	./$(DEPDIR)/ldap-grp.Po \
-+@AMDEP_TRUE@	\
-+@AMDEP_TRUE@	./$(DEPDIR)/ldap-nss.Po \
-+@AMDEP_TRUE@	\
-+@AMDEP_TRUE@	./$(DEPDIR)/ldap-schema.Po \
-+@AMDEP_TRUE@	\
-+@AMDEP_TRUE@	./$(DEPDIR)/ltf.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/pagectrl.Po ./$(DEPDIR)/resolve.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/sasl.Po ./$(DEPDIR)/snprintf.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/util.Po
-@@ -193,19 +195,6 @@
+ nss_ldap_so_DEPENDENCIES = 
+-NSS_LDAP_OBJECTS =  ldap-nss.o ldap-grp.o ldap-pwd.o ldap-netgrp.o \
+-ldap-schema.o util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o \
+-pagectrl.o aix_authmeth.o
++NSS_LDAP_OBJECTS =  ldap-nss.o ldap-grp.o ldap-pwd.o \
++	ldap-schema.o util.o ltf.o snprintf.o resolve.o dnsconfig.o irs-nss.o \
++	pagectrl.o aix_authmeth.o \
++	bsdnss.o
+ NSS_LDAP_LDADD = $(LDADD)
+ NSS_LDAP_DEPENDENCIES = 
+ CFLAGS = @CFLAGS@
+@@ -147,31 +157,18 @@
+ TAR = tar
+ GZIP_ENV = --best
+ DEP_FILES =  .deps/aix_authmeth.P .deps/dnsconfig.P .deps/irs-nss.P \
+-.deps/ldap-alias.P .deps/ldap-bp.P .deps/ldap-ethers.P .deps/ldap-grp.P \
+-.deps/ldap-hosts.P .deps/ldap-netgrp.P .deps/ldap-network.P \
+-.deps/ldap-nss.P .deps/ldap-proto.P .deps/ldap-pwd.P .deps/ldap-rpc.P \
+-.deps/ldap-schema.P .deps/ldap-service.P .deps/ldap-spwd.P .deps/ltf.P \
+-.deps/pagectrl.P .deps/resolve.P .deps/snprintf.P .deps/util.P
++.deps/ldap-grp.P \
++\
++.deps/ldap-nss.P .deps/ldap-pwd.P \
++.deps/ldap-schema.P .deps/ltf.P \
++.deps/pagectrl.P .deps/resolve.P .deps/snprintf.P .deps/util.P \
++.deps/bsdnss.P
+ SOURCES = $(nss_ldap_so_SOURCES) $(NSS_LDAP_SOURCES)
+ OBJECTS = $(nss_ldap_so_OBJECTS) $(NSS_LDAP_OBJECTS)
  
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-  configure.lineno
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .o .s
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 -
--$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 -
 -$(ACLOCAL_M4):  configure.in 
--	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-	cd $(srcdir) && $(ACLOCAL)
+-
+-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	$(SHELL) ./config.status --recheck
+-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+-	cd $(srcdir) && $(AUTOCONF)
  
- config.h: stamp-h1
+ config.h: stamp-h
  	@if test ! -f $@; then \
-@@ -243,20 +232,9 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsconfig.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globals.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/irs-nss.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-alias.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-bp.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-ethers.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-grp.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-hosts.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-netgrp.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-network.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-nss.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-proto.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-pwd.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-rpc.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-schema.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-service.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-spwd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltf.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pagectrl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve.Po@am__quote@
diff --git a/net/nss_ldap/files/patch-configure b/net/nss_ldap/files/patch-configure
index 4d16951b8531..8c0dd8f84dbe 100644
--- a/net/nss_ldap/files/patch-configure
+++ b/net/nss_ldap/files/patch-configure
@@ -1,125 +1,49 @@
-*** configure.orig	Sun Apr  6 12:36:16 2003
---- configure	Sun Apr  6 12:39:58 2003
-***************
-*** 3805,3810 ****
---- 3805,3924 ----
-  
-  done
-   ;;
-+   freebsd*)
-+ for ac_header in nss.h
-+ do
-+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+   echo "$as_me:$LINENO: checking for $ac_header" >&5
-+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ fi
-+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ else
-+   # Is the header compilable?
-+ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+ #line $LINENO "configure"
-+ #include "confdefs.h"
-+ $ac_includes_default
-+ #include <$ac_header>
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_header_compiler=yes
-+ else
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ ac_header_compiler=no
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+ echo "${ECHO_T}$ac_header_compiler" >&6
+--- configure.orig	Thu Jun 30 21:33:41 2005
++++ configure	Thu Jun 30 21:49:20 2005
+@@ -1695,6 +1695,46 @@
+ fi
+ done
+  ;;
++  freebsd*) for ac_hdr in nss.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:1663: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1668 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
 + 
-+ # Is the header present?
-+ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+ #line $LINENO "configure"
-+ #include "confdefs.h"
-+ #include <$ac_header>
-+ _ACEOF
-+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+   else
-+     ac_cpp_err=
-+   fi
-+ else
-+   ac_cpp_err=yes
-+ fi
-+ if test -z "$ac_cpp_err"; then
-+   ac_header_preproc=yes
-+ else
-+   echo "$as_me: failed program was:" >&5
-+   cat conftest.$ac_ext >&5
-+   ac_header_preproc=no
-+ fi
-+ rm -f conftest.err conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+ echo "${ECHO_T}$ac_header_preproc" >&6
-+ 
-+ # So?  What about this header?
-+ case $ac_header_compiler:$ac_header_preproc in
-+   yes:no )
-+     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+   no:yes )
-+     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+ echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+ echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+ esac
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   eval "$as_ac_Header=$ac_header_preproc"
-+ fi
-+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ 
-+ fi
-+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+   cat >>confdefs.h <<_ACEOF
-+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+ _ACEOF
-+ 
-+ fi
-+ 
-+ done
-+  ;;
-    *)
-  for ac_header in nss.h
-  do
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++ ;;
+   *) for ac_hdr in nss.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`