From af6b80f25726dbafc8bf3b2aaf15309e7f3d41fa Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Mon, 17 May 2010 08:40:49 +0100 Subject: [PATCH] Autoconf: Use AC_CACHE_CHECK AC_CACHE_CHECK has been available since Autoconf 2.5 (released in 1995), and provides a simpler mecahnism for performing cached checks than AC_CACHE_VAL does. Modify all of our simple AC_CACHE_VAL calls to use AC_CACHE_CHECK. Change-Id: I490f5e6ae5a3fdc1ada88aba9cd22c89d415a376 Reviewed-on: http://gerrit.openafs.org/1974 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- acinclude.m4 | 41 ++++++----- src/cf/irix-test.m4 | 29 ++++---- src/cf/linux-test5.m4 | 136 +++++++++++++++++------------------- src/cf/solaris-dqrwlock.m4 | 24 +++---- src/cf/solaris-fs-rolled.m4 | 24 +++---- src/cf/solaris-solookup.m4 | 24 +++---- 6 files changed, 134 insertions(+), 144 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 2379bfa20..fbafce1b6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -966,17 +966,18 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) fi esac -AC_CACHE_VAL(ac_cv_sockaddr_len, -[ -AC_MSG_CHECKING([if struct sockaddr has sa_len field]) -AC_TRY_COMPILE( [#include +AC_CACHE_CHECK([if struct sockaddr has sa_len field], + [ac_cv_sockaddr_len], + [AC_TRY_COMPILE( [#include #include ], -[struct sockaddr *a; -a->sa_len=0;], ac_cv_sockaddr_len=yes, ac_cv_sockaddr_len=no) -AC_MSG_RESULT($ac_cv_sockaddr_len)]) -if test "$ac_cv_sockaddr_len" = "yes"; then - AC_DEFINE(STRUCT_SOCKADDR_HAS_SA_LEN, 1, [define if you struct sockaddr sa_len]) -fi + [struct sockaddr *a; a->sa_len=0;], + [ac_cv_sockaddr_len=yes], + [ac_cv_sockaddr_len=no]) +]) +AS_IF([test "$ac_cv_sockaddr_len" = "yes"], + [AC_DEFINE(STRUCT_SOCKADDR_HAS_SA_LEN, 1, + [define if you struct sockaddr sa_len])]) + if test "x${MKAFS_OSTYPE}" = "xIRIX"; then echo Skipping library tests because they confuse Irix. else @@ -1030,18 +1031,20 @@ fi AC_CHECK_RESOLV_RETRANS -AC_CACHE_VAL(ac_cv_setsockopt_iprecverr, -[ -AC_MSG_CHECKING([for setsockopt(, SOL_IP, IP_RECVERR)]) -AC_TRY_COMPILE( [#include +AC_CACHE_CHECK([for setsockopt(, SOL_IP, IP_RECVERR)], + [ac_cv_setsockopt_iprecverr], + [AC_TRY_COMPILE( [ +#include #include #include ], [int on=1; -setsockopt(0, SOL_IP, IP_RECVERR, &on, sizeof(on));], ac_cv_setsockopt_iprecverr=yes, ac_cv_setsockopt_iprecverr=no) -AC_MSG_RESULT($ac_cv_setsockopt_iprecverr)]) -if test "$ac_cv_setsockopt_iprecverr" = "yes"; then - AC_DEFINE(ADAPT_PMTU_RECVERR, 1, [define if asynchronous socket errors can be received]) -fi +setsockopt(0, SOL_IP, IP_RECVERR, &on, sizeof(on));], + [ac_cv_setsockopt_iprecverr=yes], + [ac_cv_setsockopt_iprecverr=no])]) + +AS_IF([test "$ac_cv_setsockopt_iprecverr" = "yes"], + [AC_DEFINE(ADAPT_PMTU_RECVERR, 1, + [define if asynchronous socket errors can be received])]) PTHREAD_LIBS=error if test "x$MKAFS_OSTYPE" = OBSD; then diff --git a/src/cf/irix-test.m4 b/src/cf/irix-test.m4 index 81b23c5c6..712759a1e 100644 --- a/src/cf/irix-test.m4 +++ b/src/cf/irix-test.m4 @@ -1,20 +1,19 @@ AC_DEFUN([IRIX_SYS_SYSTM_H_HAS_MEM_FUNCS], [ -AC_MSG_CHECKING(for mem* in sys/systm.h) -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS -D_KERNEL -D__STRING_H__" -AC_CACHE_VAL(ac_cv_irix_sys_systm_h_has_mem_funcs, -[ -AC_TRY_COMPILE( + AC_CACHE_CHECK([for mem* in sys/systm.h], + [ac_cv_irix_sys_systm_h_has_mem_funcs], + [ + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_KERNEL -D__STRING_H__" + AC_TRY_COMPILE( [#include #include ], -[ -extern void *memcpy(char *, const void *, size_t); +[extern void *memcpy(char *, const void *, size_t); ], -ac_cv_irix_sys_systm_h_has_mem_funcs=no, -ac_cv_irix_sys_systm_h_has_mem_funcs=yes)]) -CPPFLAGS="$save_CPPFLAGS" -if test "$ac_cv_irix_sys_systm_h_has_mem_funcs" = "yes"; then - AC_DEFINE(IRIX_HAS_MEM_FUNCS, 1, [define if irix has memcpy and friends]) -fi -AC_MSG_RESULT($ac_cv_irix_sys_systm_h_has_mem_funcs) +[ac_cv_irix_sys_systm_h_has_mem_funcs=no], +[ac_cv_irix_sys_systm_h_has_mem_funcs=yes]) + CPPFLAGS="$save_CPPFLAGS" + ]) + AS_IF([test "$ac_cv_irix_sys_systm_h_has_mem_funcs" = "yes"], + [AC_DEFINE(IRIX_HAS_MEM_FUNCS, 1, + [define if irix has memcpy and friends])]) ]) diff --git a/src/cf/linux-test5.m4 b/src/cf/linux-test5.m4 index 16fabd08f..0b86d2e75 100644 --- a/src/cf/linux-test5.m4 +++ b/src/cf/linux-test5.m4 @@ -1,87 +1,77 @@ - +dnl These options seem to only be used for the 2.4.x +dnl Linux kernel build AC_DEFUN([OPENAFS_GCC_SUPPORTS_MARCH], [ -AC_MSG_CHECKING(if $CC accepts -march=pentium) -save_CFLAGS="$CFLAGS" -CFLAGS="-MARCH=pentium" -AC_CACHE_VAL(openafs_cv_gcc_supports_march,[ -AC_TRY_COMPILE( -[], -[int x;], -openafs_cv_gcc_supports_march=yes, -openafs_cv_gcc_supports_march=no)]) -AC_MSG_RESULT($openafs_cv_gcc_supports_march) -if test x$openafs_cv_gcc_supports_march = xyes; then - P5PLUS_KOPTS="-march=pentium" -else - P5PLUS_KOPTS="-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2" -fi -CFLAGS="$save_CFLAGS" + AC_CACHE_CHECK([if $CC accepts -march=pentium], + [openafs_cv_gcc_supports_march], + [save_CFLAGS="$CFLAGS" + CFLAGS="-MARCH=pentium" + AC_TRY_COMPILE([], + [int x;], + [openafs_cv_gcc_supports_march=yes], + [openafs_cv_gcc_supports_march=no]) + CFLAGS="$save_CFLAGS" + ]) + AS_IF([test x$openafs_cv_gcc_supports_march = xyes], + [P5PLUS_KOPTS="-march=pentium"], + [P5PLUS_KOPTS="-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2"]) ]) AC_DEFUN([OPENAFS_GCC_NEEDS_NO_STRICT_ALIASING], [ -AC_MSG_CHECKING(if $CC needs -fno-strict-aliasing) -save_CFLAGS="$CFLAGS" -CFLAGS="-fno-strict-aliasing" -AC_CACHE_VAL(openafs_cv_gcc_needs_no_strict_aliasing,[ -AC_TRY_COMPILE( -[], -[int x;], -openafs_cv_gcc_needs_no_strict_aliasing=yes, -openafs_cv_gcc_needs_no_strict_aliasing=no)]) -AC_MSG_RESULT($openafs_cv_gcc_needs_no_strict_aliasing) -if test x$openafs_cv_gcc_needs_no_strict_aliasing = xyes; then - LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-strict-aliasing" -fi -CFLAGS="$save_CFLAGS" + AC_CACHE_CHECK([if $CC needs -fno-strict-aliasing], + [openafs_cv_gcc_needs_no_strict_aliasing], + [save_CFLAGS="$CFLAGS" + CFLAGS="-fno-strict-aliasing" + AC_TRY_COMPILE([], + [int x;], + [openafs_cv_gcc_needs_no_strict_aliasing=yes], + [openafs_cv_gcc_needs_no_strict_aliasing=no]) + CFLAGS="$save_CFLAGS" + ]) + AS_IF([test x$openafs_cv_gcc_needs_no_strict_aliasing = xyes], + [LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-strict-aliasing"]) ]) AC_DEFUN([OPENAFS_GCC_NEEDS_NO_STRENGTH_REDUCE], [ -AC_MSG_CHECKING(if $CC needs -fno-strength-reduce) -save_CFLAGS="$CFLAGS" -CFLAGS="-fno-strength-reduce" -AC_CACHE_VAL(openafs_cv_gcc_needs_no_strength_reduce,[ -AC_TRY_COMPILE( -[], -[int x;], -openafs_cv_gcc_needs_no_strength_reduce=yes, -openafs_cv_gcc_needs_no_strength_reduce=no)]) -AC_MSG_RESULT($openafs_cv_gcc_needs_no_strength_reduce) -if test x$openafs_cv_gcc_needs_no_strength_reduce = xyes; then - LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-strength-reduce" -fi -CFLAGS="$save_CFLAGS" + AC_CACHE_CHECK([if $CC needs -fno-strength-reduce], + [openafs_cv_gcc_needs_no_strength_reduce], + [save_CFLAGS="$CFLAGS" + CFLAGS="-fno-strength-reduce" + AC_TRY_COMPILE([], + [int x;], + [openafs_cv_gcc_needs_no_strength_reduce=yes], + [openafs_cv_gcc_needs_no_strength_reduce=no]) + ]) + AS_IF([test x$openafs_cv_gcc_needs_no_strength_reduce = xyes], + [LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-strength-reduce"]) ]) AC_DEFUN([OPENAFS_GCC_SUPPORTS_NO_COMMON], [ -AC_MSG_CHECKING(if $CC supports -fno-common) -save_CFLAGS="$CFLAGS" -CFLAGS="-fno-common" -AC_CACHE_VAL(openafs_cv_gcc_supports_no_common,[ -AC_TRY_COMPILE( -[], -[int x;], -openafs_cv_gcc_supports_no_common=yes, -openafs_cv_gcc_supports_no_common=no)]) -AC_MSG_RESULT($openafs_cv_gcc_supports_no_common) -if test x$openafs_cv_gcc_supports_no_common = xyes; then - LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-common" -fi -CFLAGS="$save_CFLAGS" + AC_CACHE_CHECK([if $CC supports -fno-common], + [openafs_cv_gcc_supports_no_common], + [save_CFLAGS="$CFLAGS" + CFLAGS="-fno-common" + AC_TRY_COMPILE([], + [int x;], + [openafs_cv_gcc_supports_no_common=yes], + [openafs_cv_gcc_supports_no_common=no]) + + CFLAGS="$save_CFLAGS" + ]) + AS_IF([test x$openafs_cv_gcc_supports_no_common = xyes], + [LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-common"]) ]) AC_DEFUN([OPENAFS_GCC_SUPPORTS_PIPE], [ -AC_MSG_CHECKING(if $CC supports -pipe) -save_CFLAGS="$CFLAGS" -CFLAGS="-pipe" -AC_CACHE_VAL(openafs_cv_gcc_supports_pipe,[ -AC_TRY_COMPILE( -[], -[int x;], -openafs_cv_gcc_supports_pipe=yes, -openafs_cv_gcc_supports_pipe=no)]) -AC_MSG_RESULT($openafs_cv_gcc_supports_pipe) -if test x$openafs_cv_gcc_supports_pipe = xyes; then - LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -pipe" -fi -CFLAGS="$save_CFLAGS" + AC_CACHE_CHECK([if $CC supports -pipe], + [openafs_cv_gcc_supports_pipe], + [save_CFLAGS="$CFLAGS" + CFLAGS="-pipe" + AC_TRY_COMPILE([], + [int x;], + [openafs_cv_gcc_supports_pipe=yes], + [openafs_cv_gcc_supports_pipe=no]) + CFLAGS="$save_CFLAGS" + ]) + AS_IF([test x$openafs_cv_gcc_supports_pipe = xyes], + [LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -pipe"]) ]) diff --git a/src/cf/solaris-dqrwlock.m4 b/src/cf/solaris-dqrwlock.m4 index c26aa1c01..69c654f93 100644 --- a/src/cf/solaris-dqrwlock.m4 +++ b/src/cf/solaris-dqrwlock.m4 @@ -1,17 +1,17 @@ AC_DEFUN([SOLARIS_UFSVFS_HAS_DQRWLOCK], [ -AC_MSG_CHECKING(for vfs_dqrwlock in struct ufsvfs) -AC_CACHE_VAL(ac_cv_solaris_ufsvfs_has_dqrwlock, -[ -AC_TRY_COMPILE( -[#define _KERNEL + AC_CACHE_CHECK([for vfs_dqrwlock in struct ufsvfs], + [ac_cv_solaris_ufsvfs_has_dqrwlock], + [AC_TRY_COMPILE( + [#define _KERNEL #include ], -[struct ufsvfs _ufsvfs; + [struct ufsvfs _ufsvfs; (void) _ufsvfs.vfs_dqrwlock;], -ac_cv_solaris_ufsvfs_has_dqrwlock=yes, -ac_cv_solaris_ufsvfs_has_dqrwlock=no)]) -AC_MSG_RESULT($ac_cv_solaris_ufsvfs_has_dqrwlock) -if test "$ac_cv_solaris_ufsvfs_has_dqrwlock" = "yes"; then - AC_DEFINE(HAVE_VFS_DQRWLOCK, 1, [define if struct ufsvfs has vfs_dqrwlock]) -fi + [ac_cv_solaris_ufsvfs_has_dqrwlock=yes], + [ac_cv_solaris_ufsvfs_has_dqrwlock=no]) + ]) + AS_IF([test "$ac_cv_solaris_ufsvfs_has_dqrwlock" = "yes"], + [AC_DEFINE(HAVE_VFS_DQRWLOCK, 1, + [define if struct ufsvfs has vfs_dqrwlock]) + ]) ]) diff --git a/src/cf/solaris-fs-rolled.m4 b/src/cf/solaris-fs-rolled.m4 index 3fc22c6ad..0a0ea4209 100644 --- a/src/cf/solaris-fs-rolled.m4 +++ b/src/cf/solaris-fs-rolled.m4 @@ -1,16 +1,14 @@ AC_DEFUN([SOLARIS_FS_HAS_FS_ROLLED], [ -AC_MSG_CHECKING(for fs_rolled in struct proc) -AC_CACHE_VAL(ac_cv_solaris_fs_has_fs_rolled, -[ -AC_TRY_COMPILE( -[#include ], -[struct fs _fs; -(void) _fs.fs_rolled;], -ac_cv_solaris_fs_has_fs_rolled=yes, -ac_cv_solaris_fs_has_fs_rolled=no)]) -AC_MSG_RESULT($ac_cv_solaris_fs_has_fs_rolled) -if test "$ac_cv_solaris_fs_has_fs_rolled" = "yes"; then - AC_DEFINE(STRUCT_FS_HAS_FS_ROLLED, 1, [define if struct fs has fs_rolled]) -fi + AC_CACHE_CHECK([for fs_rolled in struct proc], + [ac_cv_solaris_fs_has_fs_rolled], + [AC_TRY_COMPILE([#include ], + [struct fs _fs; (void) _fs.fs_rolled;], + [ac_cv_solaris_fs_has_fs_rolled=yes], + [ac_cv_solaris_fs_has_fs_rolled=no]) + ]) + AS_IF([test "$ac_cv_solaris_fs_has_fs_rolled" = "yes"], + [AC_DEFINE(STRUCT_FS_HAS_FS_ROLLED, 1, + [define if struct fs has fs_rolled]) + ]) ]) diff --git a/src/cf/solaris-solookup.m4 b/src/cf/solaris-solookup.m4 index c1cb3090a..4eb53f18f 100644 --- a/src/cf/solaris-solookup.m4 +++ b/src/cf/solaris-solookup.m4 @@ -1,17 +1,17 @@ AC_DEFUN([SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS], [ -AC_MSG_CHECKING(whether solookup takes a sockparams) -AC_CACHE_VAL(ac_cv_solaris_solookup_takes_sockparams, -[ -AC_TRY_COMPILE( -[#define _KERNEL + AC_CACHE_CHECK([whether solookup takes a sockparams], + [ac_cv_solaris_solookup_takes_sockparams], + [AC_TRY_COMPILE( + [#define _KERNEL #include #include ], -[struct sockparams *sp; + [struct sockparams *sp; (void) solookup(AF_INET, SOCK_DGRAM, 0, &sp);], -ac_cv_solaris_solookup_takes_sockparams=yes, -ac_cv_solaris_solookup_takes_sockparams=no)]) -AC_MSG_RESULT($ac_cv_solaris_solookup_takes_sockparams) -if test "$ac_cv_solaris_solookup_takes_sockparams" = "yes"; then - AC_DEFINE(SOLOOKUP_TAKES_SOCKPARAMS, 1, [define if solookup takes a sockparams**]) -fi + [ac_cv_solaris_solookup_takes_sockparams=yes], + [ac_cv_solaris_solookup_takes_sockparams=no]) + ]) + AS_IF([test "$ac_cv_solaris_solookup_takes_sockparams" = "yes"], + [AC_DEFINE(SOLOOKUP_TAKES_SOCKPARAMS, 1, + [define if solookup takes a sockparams**]) + ]) ]) -- 2.39.5