diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-08 16:25:53 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:04:00 -0500 |
commit | 4ab73d6045aacd354894fe5edf0c5cfc75784064 (patch) | |
tree | 9504f41360cc4a99d059f36d69e11380df026e2c /source4/build | |
parent | 4a61e4901ebc751fea57880424f9045e3bdf238e (diff) | |
download | samba-4ab73d6045aacd354894fe5edf0c5cfc75784064.tar.gz samba-4ab73d6045aacd354894fe5edf0c5cfc75784064.tar.bz2 samba-4ab73d6045aacd354894fe5edf0c5cfc75784064.zip |
r15000: Move some more autoconf tests out of build/m4/rewrite.m4
Guarantee availability of __FUNCTION__ in libreplace
(This used to be commit 76b1576541210f2bb306ae17e0876b254e8dcead)
Diffstat (limited to 'source4/build')
-rw-r--r-- | source4/build/m4/rewrite.m4 | 42 | ||||
-rw-r--r-- | source4/build/tests/ftruncate.c | 2 |
2 files changed, 1 insertions, 43 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index c65c82345d..f6897dd924 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -172,10 +172,6 @@ case "$host_os" in AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block]) ;; *irix*) AC_DEFINE(IRIX,1,[Whether the host os is irix]) - case "$host_os" in - *irix6*) AC_DEFINE(IRIX6,1,[Whether the host os is irix6]) - ;; - esac ATTEMPT_WRAP32_BUILD=yes BLDSHARED="true" LDSHFLAGS="-set_version sgi1.0 -shared" @@ -303,13 +299,6 @@ if test $ac_cv_shlib_works = no; then fi fi -AC_CACHE_CHECK([for __FUNCTION__ macro],samba_cv_HAVE_FUNCTION_MACRO,[ -AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __FUNCTION__);], -samba_cv_HAVE_FUNCTION_MACRO=yes,samba_cv_HAVE_FUNCTION_MACRO=no)]) -if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then - AC_DEFINE(HAVE_FUNCTION_MACRO,1,[Whether there is a __FUNCTION__ macro]) -fi - AC_CACHE_CHECK([if gettimeofday takes tz argument],samba_cv_HAVE_GETTIMEOFDAY_TZ,[ AC_TRY_RUN([ #include <sys/time.h> @@ -392,24 +381,6 @@ if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then AC_DEFINE(HAVE_KERNEL_OPLOCKS_IRIX,1,[Whether IRIX kernel oplock type definitions are available]) fi -AC_CACHE_CHECK([for irix specific capabilities],samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES,[ -AC_TRY_RUN([#include <sys/types.h> -#include <sys/capability.h> -main() { - cap_t cap; - if ((cap = cap_get_proc()) == NULL) - exit(1); - cap->cap_effective |= CAP_NETWORK_MGT; - cap->cap_inheritable |= CAP_NETWORK_MGT; - cap_set_proc(cap); - exit(0); -} -], -samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=yes,samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no,samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=cross)]) -if test x"$samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES" = x"yes"; then - AC_DEFINE(HAVE_IRIX_SPECIFIC_CAPABILITIES,1,[Whether IRIX specific capabilities are available]) -fi - AC_CACHE_CHECK([for ftruncate extend],samba_cv_HAVE_FTRUNCATE_EXTEND,[ AC_TRY_RUN([#include "${srcdir-.}/build/tests/ftruncate.c"], @@ -418,13 +389,6 @@ if test x"$samba_cv_HAVE_FTRUNCATE_EXTEND" = x"yes"; then AC_DEFINE(HAVE_FTRUNCATE_EXTEND,1,[Truncate extend]) fi -AC_CACHE_CHECK([for broken getgroups],samba_cv_HAVE_BROKEN_GETGROUPS,[ -AC_TRY_RUN([#include "${srcdir-.}/build/tests/getgroups.c"], - samba_cv_HAVE_BROKEN_GETGROUPS=yes,samba_cv_HAVE_BROKEN_GETGROUPS=no,samba_cv_HAVE_BROKEN_GETGROUPS=cross)]) -if test x"$samba_cv_HAVE_BROKEN_GETGROUPS" = x"yes"; then - AC_DEFINE(HAVE_BROKEN_GETGROUPS,1,[Whether getgroups is broken]) -fi - AC_CACHE_CHECK([for sysconf(_SC_NGROUPS_MAX)],samba_cv_SYSCONF_SC_NGROUPS_MAX,[ AC_TRY_RUN([#include <unistd.h> main() { exit(sysconf(_SC_NGROUPS_MAX) == -1 ? 1 : 0); }], @@ -489,9 +453,3 @@ samba_cv_HAVE_OPEN_O_DIRECT=yes,samba_cv_HAVE_OPEN_O_DIRECT=no)]) if test x"$samba_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then AC_DEFINE(HAVE_OPEN_O_DIRECT,1,[Whether the open(2) accepts O_DIRECT]) fi - -############################################### -# test for where we get crypt() from -AC_CHECK_LIB_EXT(crypt, CRYPT_LIBS, crypt) -SMB_EXT_LIB_ENABLE(CRYPT,YES) -SMB_EXT_LIB(CRYPT, $CRYPT_LIBS) diff --git a/source4/build/tests/ftruncate.c b/source4/build/tests/ftruncate.c index 93282782ee..e71b29fd83 100644 --- a/source4/build/tests/ftruncate.c +++ b/source4/build/tests/ftruncate.c @@ -1,4 +1,4 @@ -/* test whether ftruncte() can extend a file */ +/* test whether ftruncate() can extend a file */ #if defined(HAVE_UNISTD_H) #include <unistd.h> |