------------------------------------------------------------
revno: 13016
revision-id: squid3@treenet.co.nz-20131024151116-l9a805792iivy85l
parent: squid3@treenet.co.nz-20131024150912-0sue3ao2w2fqy6x7
author: Francesco Chemolli <kinkie@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Thu 2013-10-24 09:11:16 -0600
message:
  basic_nis_auth: Improved portability
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131024151116-l9a805792iivy85l
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 57c05fb35025e77d3efcd5ea693fb96dd4f7ad03
# timestamp: 2013-10-24 15:12:16 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20131024150912-\
#   0sue3ao2w2fqy6x7
# 
# Begin patch
=== modified file 'helpers/basic_auth/NIS/nis_support.cc'
--- helpers/basic_auth/NIS/nis_support.cc	2012-01-20 18:55:04 +0000
+++ helpers/basic_auth/NIS/nis_support.cc	2013-10-24 15:11:16 +0000
@@ -2,12 +2,25 @@
  * Written By Rabellino Sergio (rabellino@di.unito.it) For Solaris 2.x
  */
 #include "squid.h"
+
+#if HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#if HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+#if HAVE_SYSLOG_H
 #include <syslog.h>
+#endif
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#if HAVE_RPC_RPC_H
 #include <rpc/rpc.h>
+#endif
 
 #if _SQUID_FREEBSD_  && !defined(BOOL_DEFINED)
 // BUG: FreeBSD rpcsvc/yp_* headers try to redefine bool unless we match their non-standard hack.
@@ -15,7 +28,10 @@
 #endif
 
 #include <rpcsvc/ypclnt.h>
+
+#if HAVE_RPCSVC_YP_PROT_H
 #include <rpcsvc/yp_prot.h>
+#endif
 
 #include "nis_support.h"
 

=== modified file 'helpers/basic_auth/NIS/required.m4'
--- helpers/basic_auth/NIS/required.m4	2013-05-01 06:59:12 +0000
+++ helpers/basic_auth/NIS/required.m4	2013-10-24 15:11:16 +0000
@@ -1,1 +1,5 @@
-AC_CHECK_HEADERS([rpcsvc/yp_prot.h],[BUILD_HELPER="NIS"])
+AC_CHECK_HEADERS([sys/types.h rpc/rpc.h rpcsvc/yp_prot.h],[BUILD_HELPER="NIS"],,AC_INCLUDES_DEFAULT([
+#if HAVE_RPC_RPC_H
+#include <rpc/rpc.h>
+#endif
+]))