Author: jra Date: 2005-08-12 22:58:47 +0000 (Fri, 12 Aug 2005) New Revision: 9281
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9281 Log: Fixes from Luke Mewburn <[EMAIL PROTECTED]> for misuses of AC_CHECK_HEADERS. Jeremy. Modified: branches/SAMBA_3_0/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2005-08-12 22:58:44 UTC (rev 9280) +++ branches/SAMBA_3_0/source/configure.in 2005-08-12 22:58:47 UTC (rev 9281) @@ -731,8 +731,6 @@ AC_CHECK_HEADERS(aio.h arpa/inet.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.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/ypclnt.h) -## These fail to compile on IRIX so just check for their presence -AC_CHECK_HEADERS(rpcsvc/yp_prot.h, sys/mode.h, [], [] -) AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.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/un.h) @@ -742,6 +740,15 @@ AC_CHECK_HEADERS(sys/syslog.h syslog.h execinfo.h) AC_CHECK_HEADERS(langinfo.h locale.h) +AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[ +#if HAVE_RPC_RPC_H +#include <rpc/rpc.h> +#endif +]]) + +## These fail to compile on IRIX so just check for their presence +AC_CHECK_HEADERS(sys/mode.h,,,) + # Look for Darwin headers old_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-Iinclude $CPPFLAGS" @@ -784,9 +791,30 @@ AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h) AC_CHECK_HEADERS(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, [], [], -) +AC_CHECK_HEADERS(netinet/ip.h,,,[[ +#include <sys/types.h> +#if HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#include <netinet/in.h> +#if HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif +]]) +AC_CHECK_HEADERS(net/if.h,,,[[ +#include <sys/types.h> +#if HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +]]) + +AC_CHECK_HEADERS(security/pam_modules.h,,,[[ +#if HAVE_SECURITY_PAM_APPL_H +#include <security/pam_appl.h> +#endif +]]) + # For experimental utmp support (lastlog on some BSD-like systems) AC_CHECK_HEADERS(utmp.h utmpx.h lastlog.h) @@ -929,7 +957,10 @@ #include <stddef.h> #endif #include <time.h> -#include <aio.h>],[struct timespec ts;], +#if HAVE_AIO_H +#include <aio.h> +#endif +],[struct timespec ts;], samba_cv_struct_timespec=yes,samba_cv_struct_timespec=no)]) if test x"$samba_cv_struct_timespec" = x"yes"; then AC_DEFINE(HAVE_STRUCT_TIMESPEC,1,[Whether we have struct timespec])
