Author: jelmer Date: 2006-04-08 16:25:53 +0000 (Sat, 08 Apr 2006) New Revision: 15000
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15000 Log: Move some more autoconf tests out of build/m4/rewrite.m4 Guarantee availability of __FUNCTION__ in libreplace Added: branches/SAMBA_4_0/source/lib/util/capability.m4 Modified: branches/SAMBA_4_0/source/auth/config.m4 branches/SAMBA_4_0/source/build/m4/rewrite.m4 branches/SAMBA_4_0/source/build/tests/ftruncate.c branches/SAMBA_4_0/source/configure.in branches/SAMBA_4_0/source/lib/replace/README branches/SAMBA_4_0/source/lib/replace/config.m4 branches/SAMBA_4_0/source/lib/replace/replace.h branches/SAMBA_4_0/source/lib/util/capability.c branches/SAMBA_4_0/source/lib/util/debug.h Changeset: Modified: branches/SAMBA_4_0/source/auth/config.m4 =================================================================== --- branches/SAMBA_4_0/source/auth/config.m4 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/auth/config.m4 2006-04-08 16:25:53 UTC (rev 15000) @@ -9,3 +9,9 @@ SMB_EXT_LIB(PAM, $PAM_LIBS) # end SMB_EXT_LIB_PAM ############################### + +################################################ +# 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) Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-04-08 16:25:53 UTC (rev 15000) @@ -172,10 +172,6 @@ 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 @@ 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,25 +381,7 @@ 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"], samba_cv_HAVE_FTRUNCATE_EXTEND=yes,samba_cv_HAVE_FTRUNCATE_EXTEND=no,samba_cv_HAVE_FTRUNCATE_EXTEND=cross)]) @@ -418,13 +389,6 @@ 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 @@ 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) Modified: branches/SAMBA_4_0/source/build/tests/ftruncate.c =================================================================== --- branches/SAMBA_4_0/source/build/tests/ftruncate.c 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/build/tests/ftruncate.c 2006-04-08 16:25:53 UTC (rev 15000) @@ -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> Modified: branches/SAMBA_4_0/source/configure.in =================================================================== --- branches/SAMBA_4_0/source/configure.in 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/configure.in 2006-04-08 16:25:53 UTC (rev 15000) @@ -17,6 +17,7 @@ sinclude(lib/replace/repdir/config.m4) sinclude(heimdal_build/config.m4) sinclude(lib/util/fsusage.m4) +sinclude(lib/util/capability.m4) sinclude(lib/popt/config.m4) sinclude(lib/charset/config.m4) sinclude(lib/socket/config.m4) Modified: branches/SAMBA_4_0/source/lib/replace/README =================================================================== --- branches/SAMBA_4_0/source/lib/replace/README 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/lib/replace/README 2006-04-08 16:25:53 UTC (rev 15000) @@ -65,6 +65,10 @@ UINT32_MAX UINT64_MAX +Macros: +va_copy +__FUNCTION__ + Prerequisites: memset (for bzero) syslog (for vsyslog) Modified: branches/SAMBA_4_0/source/lib/replace/config.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/config.m4 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/lib/replace/config.m4 2006-04-08 16:25:53 UTC (rev 15000) @@ -152,4 +152,10 @@ fi fi - +dnl __FUNCTION__ macro +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 Modified: branches/SAMBA_4_0/source/lib/replace/replace.h =================================================================== --- branches/SAMBA_4_0/source/lib/replace/replace.h 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/lib/replace/replace.h 2006-04-08 16:25:53 UTC (rev 15000) @@ -209,4 +209,8 @@ #define true (1) #endif +#ifndef HAVE_FUNCTION_MACRO +#define __FUNCTION__ ("") #endif + +#endif Modified: branches/SAMBA_4_0/source/lib/util/capability.c =================================================================== --- branches/SAMBA_4_0/source/lib/util/capability.c 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/lib/util/capability.c 2006-04-08 16:25:53 UTC (rev 15000) @@ -114,4 +114,3 @@ set_inherited_process_capability(KERNEL_OPLOCK_CAPABILITY,inherit); #endif } - Added: branches/SAMBA_4_0/source/lib/util/capability.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/util/capability.m4 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/lib/util/capability.m4 2006-04-08 16:25:53 UTC (rev 15000) @@ -0,0 +1,17 @@ +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 Modified: branches/SAMBA_4_0/source/lib/util/debug.h =================================================================== --- branches/SAMBA_4_0/source/lib/util/debug.h 2006-04-08 16:05:21 UTC (rev 14999) +++ branches/SAMBA_4_0/source/lib/util/debug.h 2006-04-08 16:25:53 UTC (rev 15000) @@ -23,14 +23,6 @@ * @brief Debugging macros */ -/* If we have these macros, we can add additional info to the header. */ - -#ifdef HAVE_FUNCTION_MACRO -#define FUNCTION_MACRO (__FUNCTION__) -#else -#define FUNCTION_MACRO ("") -#endif - /* the debug operations structure - contains function pointers to various debug implementations of each operation */ struct debug_ops { @@ -54,7 +46,7 @@ #define _DEBUG(level, body, header) do { \ if (DEBUGLVL(level)) { \ if (header) { \ - do_debug_header(level, __location__, FUNCTION_MACRO); \ + do_debug_header(level, __location__, __FUNCTION__); \ } \ do_debug body; \ } \