summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-10-31 22:06:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:06 -0500
commit792b6ef511454c00cc5e4350a4cfb282a4d4dce0 (patch)
tree6280ed5b9a3883f0c59be9ae4ba3008f31d71b9d /source3
parent9341fddf26a9b0f6bb74f7acbd7f40925fd6d476 (diff)
downloadsamba-792b6ef511454c00cc5e4350a4cfb282a4d4dce0.tar.gz
samba-792b6ef511454c00cc5e4350a4cfb282a4d4dce0.tar.bz2
samba-792b6ef511454c00cc5e4350a4cfb282a4d4dce0.zip
r3417: BUG 350: patch from Matt Selsky <selsky@columbia.edu> to use autoconf feature preopcessing header file only (3 problematic headers on solaris)
(This used to be commit b4da6bd0f12d599eff4a90a91ca469145bee6275)
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 2b31d24e23..c7335c5df0 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -654,13 +654,13 @@ AC_HEADER_DIRENT
AC_HEADER_TIME
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(arpa/inet.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h)
-AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h)
+AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h)
AC_CHECK_HEADERS(rpc/rpc.h rpcsvc/nis.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h)
AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/mode.h)
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(sys/sysmacros.h security/pam_modules.h security/_pam_macros.h dlfcn.h)
+AC_CHECK_HEADERS(sys/sysmacros.h security/_pam_macros.h dlfcn.h)
AC_CHECK_HEADERS(sys/syslog.h syslog.h execinfo.h)
AC_CHECK_HEADERS(langinfo.h locale.h)
@@ -687,11 +687,13 @@ case "$host_os" in
fi
;;
esac
-AC_CHECK_HEADERS(shadow.h netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
-AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h security/pam_appl.h security/pam_modules.h)
+AC_CHECK_HEADERS(shadow.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
+AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h security/pam_appl.h)
AC_CHECK_HEADERS(stropts.h poll.h)
AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h)
AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/cdefs.h glob.h)
+# These faile to compile on Solaris so just check for their presence
+AC_CHECK_HEADERS(security/pam_modules.h net/if.h netinet/ip.h, [], [], -)
# For experimental utmp support (lastlog on some BSD-like systems)
AC_CHECK_HEADERS(utmp.h utmpx.h lastlog.h)