diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-16 01:16:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:53:48 -0500 |
| commit | 0f3b182ba95dc062c0bcb10efea30938fba47a7c (patch) | |
| tree | c360cadccbf63a513bf2ddc579246ec81a459a29 /source4/build/m4 | |
| parent | a22c38d70a4b020155588e362cc92bf38262d14f (diff) | |
| download | samba-0f3b182ba95dc062c0bcb10efea30938fba47a7c.tar.gz samba-0f3b182ba95dc062c0bcb10efea30938fba47a7c.tar.bz2 samba-0f3b182ba95dc062c0bcb10efea30938fba47a7c.zip | |
r749: move the basic type checks
be more restrict if we don't have 'long long' or it's size is less than 8 bytes
(maybe only for a while, but if the build farm like it we may let it in forever
since the smb protocol really need 64 bit variables!)
metze
(This used to be commit 4a13cc22b464dfc4cbecfa6922b14c60d95876bd)
Diffstat (limited to 'source4/build/m4')
| -rw-r--r-- | source4/build/m4/rewrite.m4 | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index 1639a42939..20aef6f80d 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -74,6 +74,21 @@ AC_VALIDATE_CACHE_SYSTEM_TYPE DYNEXP= +AC_HEADER_STDC +AC_CHECK_HEADERS(stdbool.h) + +AC_CHECK_SIZEOF(short,cross) +AC_CHECK_SIZEOF(int,cross) +AC_CHECK_SIZEOF(long,cross) +AC_CHECK_SIZEOF(long long,cross) +if test x"$ac_cv_type_long_long" != x"yes";then + AC_MSG_ERROR([Sorry we need type 'long long']) +fi +if test $ac_cv_sizeof_long_long -lt 8;then + AC_MSG_ERROR([Sorry we need sizeof(long long) >= 8]) +fi +AC_CHECK_TYPE(_Bool) + # # Config CPPFLAG settings for strange OS's that must be set # before other tests. @@ -295,13 +310,12 @@ exit(1); esac -AC_INLINE -AC_HEADER_STDC + AC_HEADER_DIRENT AC_HEADER_TIME AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(arpa/inet.h sys/select.h fcntl.h sys/fcntl.h sys/time.h) -AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h) +AC_CHECK_HEADERS(utime.h grp.h sys/id.h limits.h memory.h net/if.h) AC_CHECK_HEADERS(compat.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) @@ -324,15 +338,6 @@ case "$host_os" in ;; esac -AC_CHECK_SIZEOF(int,cross) -AC_CHECK_SIZEOF(short,cross) -AC_CHECK_SIZEOF(long,cross) -AC_CHECK_SIZEOF(long long,cross) -AC_CHECK_HEADERS(stdint.h) -AC_CHECK_HEADERS(inttypes.h) -AC_CHECK_SIZEOF(_Bool,cross) -AC_CHECK_HEADERS(stdbool.h) - 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 ns_api.h sys/security.h security/pam_appl.h security/pam_modules.h) AC_CHECK_HEADERS(stropts.h) |