summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-02-05 03:33:42 +0000
committerJeremy Allison <jra@samba.org>2002-02-05 03:33:42 +0000
commit81d6afa76bf948e245f3ba42733e26fd74b0cccc (patch)
tree22539626113f312b32961f582d60199c1ca2dc77
parent72f6efe38808b8c7205607031134e6bef2294cf8 (diff)
downloadsamba-81d6afa76bf948e245f3ba42733e26fd74b0cccc.tar.gz
samba-81d6afa76bf948e245f3ba42733e26fd74b0cccc.tar.xz
samba-81d6afa76bf948e245f3ba42733e26fd74b0cccc.zip
Fix HPUX build (less than 11.x).
-rwxr-xr-xsource/configure2
-rw-r--r--source/configure.in2
-rw-r--r--source/include/config.h.in3
-rw-r--r--source/nsswitch/nss.h2
4 files changed, 6 insertions, 3 deletions
diff --git a/source/configure b/source/configure
index 52dc6ebc8c8..3f3422cff45 100755
--- a/source/configure
+++ b/source/configure
@@ -2292,7 +2292,7 @@ else
fi
done
-for ac_hdr in security/pam_modules.h security/_pam_macros.h synch.h pthread.h
+for ac_hdr in security/pam_modules.h security/_pam_macros.h synch.h pthread.h nsswitch.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/source/configure.in b/source/configure.in
index 504989344cb..b22d33e89a5 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -381,7 +381,7 @@ AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/i
AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h sys/socket.h)
AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
-AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h synch.h pthread.h)
+AC_CHECK_HEADERS(security/pam_modules.h security/_pam_macros.h synch.h pthread.h nsswitch.h)
#
# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
diff --git a/source/include/config.h.in b/source/include/config.h.in
index 803c2a6ca0e..bc956315e6b 100644
--- a/source/include/config.h.in
+++ b/source/include/config.h.in
@@ -858,6 +858,9 @@
/* Define if you have the <nss_common.h> header file. */
#undef HAVE_NSS_COMMON_H
+/* Define if you have the <nsswitch.h> header file. */
+#undef HAVE_NSSWITCH_H
+
/* Define if you have the <poll.h> header file. */
#undef HAVE_POLL_H
diff --git a/source/nsswitch/nss.h b/source/nsswitch/nss.h
index 6165e0b24a5..f30f9ca1348 100644
--- a/source/nsswitch/nss.h
+++ b/source/nsswitch/nss.h
@@ -73,7 +73,7 @@ typedef enum
#define NSD_MEM_VOLATILE 1
#define NSD_MEM_DYNAMIC 2
-#elif defined(HPUX)
+#elif defined(HPUX) && defined(HAVE_NSSWITCH_H)
/* HP-UX 11 */
#include "nsswitch/hp_nss_common.h"