From 2e23fceec872795a39b915b73e48eb77a5d65afe Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Mon, 29 Feb 2016 13:28:28 -0500 Subject: [PATCH] autoconf: autoupdate macros Run autoupdate on macros. [mmeffie@sinenomine.net: re-run autoupdate, no other edits] Change-Id: I8b45edea97cf2e065f23f02d2d7f6a0e7adcb8a5 Reviewed-on: https://gerrit.openafs.org/12202 Tested-by: BuildBot Reviewed-by: Michael Meffie Reviewed-by: Andrew Deason Reviewed-by: Marcio Brito Barbosa Reviewed-by: Benjamin Kaduk --- acinclude.m4 | 2 +- src/cf/bigendian.m4 | 17 ++++++++--------- src/cf/c-atomic.m4 | 4 +--- src/cf/c-struct-label.m4 | 8 +++----- src/cf/ctf-tools.m4 | 8 ++++---- src/cf/hcrypto.m4 | 11 ++++------- src/cf/irix-test.m4 | 10 +++------- src/cf/library.m4 | 8 +++----- src/cf/linux-test1.m4 | 4 ++-- src/cf/linux-test5.m4 | 25 +++++-------------------- src/cf/options.m4 | 2 +- src/cf/ressearch.m4 | 16 ++++++---------- src/cf/retsigtype.m4 | 13 ++++++++++++- src/cf/roken.m4 | 2 +- src/cf/sizet.m4 | 7 ++----- src/cf/socket.m4 | 16 +++++----------- src/cf/solaris-dqrwlock.m4 | 10 +++------- src/cf/solaris-fs-rolled.m4 | 5 +---- src/cf/solaris-solookup.m4 | 10 +++------- src/cf/solaris-test1.m4 | 5 +---- src/cf/test_package.m4 | 4 ++-- src/cf/types.m4 | 15 +++++++++++++-- src/cf/ucontext.m4 | 7 +++---- 23 files changed, 87 insertions(+), 122 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 7b35bb1..c06945c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -14,7 +14,7 @@ OPENAFS_OPTIONS OPENAFS_DOC dnl Checks for UNIX variants. -AC_ISC_POSIX +AC_SEARCH_LIBS([strerror],[cposix]) dnl Various compiler setup. AC_TYPE_PID_T diff --git a/src/cf/bigendian.m4 b/src/cf/bigendian.m4 index f260cd1..6c7ae80 100644 --- a/src/cf/bigendian.m4 +++ b/src/cf/bigendian.m4 @@ -17,22 +17,22 @@ AC_ARG_ENABLE([littleendian], AC_CACHE_CHECK(whether byte order is known at compile time, openafs_cv_c_bigendian_compile, -[AC_TRY_COMPILE([ +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include -#include ],[ +#include ]], [[ #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN bogus endian macros -#endif], openafs_cv_c_bigendian_compile=yes, openafs_cv_c_bigendian_compile=no)]) +#endif]])],[openafs_cv_c_bigendian_compile=yes],[openafs_cv_c_bigendian_compile=no])]) AC_CACHE_CHECK(whether byte ordering is bigendian, openafs_cv_c_bigendian,[ if test "$openafs_cv_c_bigendian_compile" = "yes"; then - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include -#include ],[ +#include ]], [[ #if BYTE_ORDER != BIG_ENDIAN not big endian -#endif], openafs_cv_c_bigendian=yes, openafs_cv_c_bigendian=no) +#endif]])],[openafs_cv_c_bigendian=yes],[openafs_cv_c_bigendian=no]) else - AC_TRY_RUN([main () { + AC_RUN_IFELSE([AC_LANG_SOURCE([[main () { /* Are we little or big endian? From Harbison&Steele. */ union { @@ -41,8 +41,7 @@ AC_CACHE_CHECK(whether byte ordering is bigendian, openafs_cv_c_bigendian,[ } u; u.l = 1; exit (u.c[sizeof (long) - 1] == 1); - }], openafs_cv_c_bigendian=no, openafs_cv_c_bigendian=yes, - AC_MSG_ERROR([specify either --enable-bigendian or --enable-littleendian])) + }]])],[openafs_cv_c_bigendian=no],[openafs_cv_c_bigendian=yes],[AC_MSG_ERROR(specify either --enable-bigendian or --enable-littleendian)]) fi ]) if test "$openafs_cv_c_bigendian" = "yes"; then diff --git a/src/cf/c-atomic.m4 b/src/cf/c-atomic.m4 index 3356e52..4b443b4 100644 --- a/src/cf/c-atomic.m4 +++ b/src/cf/c-atomic.m4 @@ -1,9 +1,7 @@ AC_DEFUN([OPENAFS_C_ATOMIC_CHECKS], [ AC_CACHE_CHECK([if compiler has __sync_add_and_fetch], [ac_cv_sync_fetch_and_add], - [AC_TRY_LINK(, [int var; return __sync_add_and_fetch(&var, 1);], - [ac_cv_sync_fetch_and_add=yes], - [ac_cv_sync_fetch_and_add=no]) + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int var; return __sync_add_and_fetch(&var, 1);]])],[ac_cv_sync_fetch_and_add=yes],[ac_cv_sync_fetch_and_add=no]) ]) AS_IF([test "$ac_cv_sync_fetch_and_add" = "yes"], [AC_DEFINE(HAVE_SYNC_FETCH_AND_ADD, 1, diff --git a/src/cf/c-struct-label.m4 b/src/cf/c-struct-label.m4 index 9232c7d..2c728ec 100644 --- a/src/cf/c-struct-label.m4 +++ b/src/cf/c-struct-label.m4 @@ -1,7 +1,7 @@ AC_DEFUN([OPENAFS_C_STRUCT_LABEL_CHECK],[ dnl Check to see if the compiler support labels in structs AC_MSG_CHECKING(for label support in structs) -AC_TRY_COMPILE([], [ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ extern void osi_UFSOpen(void); struct labeltest { void (*open) (void); @@ -9,10 +9,8 @@ struct labeltest { struct labeltest struct_labeltest = { .open = osi_UFSOpen, } -], -[AC_MSG_RESULT(yes) +]])],[AC_MSG_RESULT(yes) AC_DEFINE(HAVE_STRUCT_LABEL_SUPPORT, 1, [Define to 1 if your compiler supports labels in structs.]) -], -[AC_MSG_RESULT(no) +],[AC_MSG_RESULT(no) ]) ]) diff --git a/src/cf/ctf-tools.m4 b/src/cf/ctf-tools.m4 index 3880a88..a45529d 100644 --- a/src/cf/ctf-tools.m4 +++ b/src/cf/ctf-tools.m4 @@ -14,15 +14,15 @@ AS_CASE([$CTF_TOOLS], [yes], [AC_PATH_PROG([CTFCONVERT], [ctfconvert], [], [$CTF_DEFAULT_PATH]) AC_PATH_PROG([CTFMERGE], [ctfmerge], [], [$CTF_DEFAULT_PATH]) - AS_IF([test "x$CTFCONVERT" = "x"], [AC_ERROR("ctfconvert not found")]) - AS_IF([test "x$CTFMERGE" = "x"], [AC_ERROR("ctfmerge not found")])], + AS_IF([test "x$CTFCONVERT" = "x"], [AC_MSG_ERROR("ctfconvert not found")]) + AS_IF([test "x$CTFMERGE" = "x"], [AC_MSG_ERROR("ctfmerge not found")])], [no], [], [AC_PATH_PROG([CTFCONVERT], [ctfconvert], [], [$CTF_TOOLS]) AC_PATH_PROG([CTFMERGE], [ctfmerge], [], [$CTF_TOOLS]) - AS_IF([test "x$CTFCONVERT" = "x"], [AC_ERROR("ctfconvert not found")]) - AS_IF([test "x$CTFMERGE" = "x"], [AC_ERROR("ctfmerge not found")])] + AS_IF([test "x$CTFCONVERT" = "x"], [AC_MSG_ERROR("ctfconvert not found")]) + AS_IF([test "x$CTFMERGE" = "x"], [AC_MSG_ERROR("ctfmerge not found")])] ) AC_ARG_VAR([CTFCONVERT], [Path to ctfconvert]) diff --git a/src/cf/hcrypto.m4 b/src/cf/hcrypto.m4 index 2a99988..79d6843 100644 --- a/src/cf/hcrypto.m4 +++ b/src/cf/hcrypto.m4 @@ -83,21 +83,18 @@ AC_DEFUN([OPENAFS_HCRYPTO], [ AC_SUBST(hcrypto_install_target) AC_ARG_WITH([hcrypto], - [AC_HELP_STRING([--with-hcrypto=DIR], - [Location of the hcrypto library, or 'internal'])], + [AS_HELP_STRING([--with-hcrypto=DIR],[Location of the hcrypto library, or 'internal'])], [AS_IF([test x"$withval" = xno], - [AC_ERROR("OpenAFS requires hcrypto to build")], + [AC_MSG_ERROR("OpenAFS requires hcrypto to build")], [AS_IF([test x"$withval" != xyes], [hcrypto_root="$withval"])])] ) AC_ARG_WITH([hcrypto-include], - [AC_HELP_STRING([--with-hcrypto-include=DIR], - [Location of hcrypto headers])], + [AS_HELP_STRING([--with-hcrypto-include=DIR],[Location of hcrypto headers])], [AS_IF([test x"$withval" != xyes && test x"$withval" != xno], [hcrypto_includedir=$withval])]) AC_ARG_WITH([hcrypto-lib], - [AC_HELP_STRING([--with-hcrypto-lib=DIR], - [Location of the hcrypto library])], + [AS_HELP_STRING([--with-hcrypto-lib=DIR],[Location of the hcrypto library])], [AS_IF([test x"$withval" != xyes && test x"$withval" != xno], [hcrypto_libdir=$withval])]) diff --git a/src/cf/irix-test.m4 b/src/cf/irix-test.m4 index 712759a..95dd9f2 100644 --- a/src/cf/irix-test.m4 +++ b/src/cf/irix-test.m4 @@ -4,13 +4,9 @@ AC_DEFUN([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); -], -[ac_cv_irix_sys_systm_h_has_mem_funcs=no], -[ac_cv_irix_sys_systm_h_has_mem_funcs=yes]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include +#include ]], [[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" ]) AS_IF([test "$ac_cv_irix_sys_systm_h_has_mem_funcs" = "yes"], diff --git a/src/cf/library.m4 b/src/cf/library.m4 index 17d9220..95af14f 100644 --- a/src/cf/library.m4 +++ b/src/cf/library.m4 @@ -8,7 +8,7 @@ else dnl darwin wants it, aix hates it AC_MSG_CHECKING(for the useability of arpa/nameser_compat.h) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #include #include @@ -18,10 +18,8 @@ else #include #include #include - ], [static int i; i = 0;], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_ARPA_NAMESER_COMPAT_H, 1, [define if arpa/nameser_compat.h exists])], - [AC_MSG_RESULT(no) + ]], [[static int i; i = 0;]])],[AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_ARPA_NAMESER_COMPAT_H, 1, [define if arpa/nameser_compat.h exists])],[AC_MSG_RESULT(no) ]) openafs_save_libs="$LIBS" diff --git a/src/cf/linux-test1.m4 b/src/cf/linux-test1.m4 index 95e4af0..02f3f90 100644 --- a/src/cf/linux-test1.m4 +++ b/src/cf/linux-test1.m4 @@ -47,9 +47,9 @@ _ACEOF AC_DEFUN([AC_TRY_KBUILD24], [ ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ -Werror-implicit-function-declaration $CPPFLAGS" - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include -$1], [$2], [$3], [$4]) +$1]], [[$2]])],[$3],[$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) diff --git a/src/cf/linux-test5.m4 b/src/cf/linux-test5.m4 index 90c312c..8b99d57 100644 --- a/src/cf/linux-test5.m4 +++ b/src/cf/linux-test5.m4 @@ -5,10 +5,7 @@ AC_DEFUN([OPENAFS_GCC_SUPPORTS_MARCH], [ [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]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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], @@ -21,10 +18,7 @@ AC_DEFUN([OPENAFS_GCC_NEEDS_NO_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]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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], @@ -36,10 +30,7 @@ AC_DEFUN([OPENAFS_GCC_NEEDS_NO_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]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int x;]])],[openafs_cv_gcc_needs_no_strength_reduce=yes],[openafs_cv_gcc_needs_no_strength_reduce=no]) CFLAGS="$save_CFLAGS" ]) AS_IF([test x$openafs_cv_gcc_needs_no_strength_reduce = xyes], @@ -51,10 +42,7 @@ AC_DEFUN([OPENAFS_GCC_SUPPORTS_NO_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]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int x;]])],[openafs_cv_gcc_supports_no_common=yes],[openafs_cv_gcc_supports_no_common=no]) CFLAGS="$save_CFLAGS" ]) @@ -67,10 +55,7 @@ AC_DEFUN([OPENAFS_GCC_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]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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], diff --git a/src/cf/options.m4 b/src/cf/options.m4 index 0e1c9df..4b20ae8 100644 --- a/src/cf/options.m4 +++ b/src/cf/options.m4 @@ -241,7 +241,7 @@ AC_ARG_WITH([docbook-stylesheets], /opt/local/share/xsl/docbook-xsl], [$HTML_XSL]) AS_IF([test "x$DOCBOOK_STYLESHEETS" = "x"], - [AC_WARN([Docbook stylesheets not found; some documentation can't be built]) + [AC_MSG_WARN(Docbook stylesheets not found; some documentation can't be built) ]) ]) diff --git a/src/cf/ressearch.m4 b/src/cf/ressearch.m4 index 7326edb..94d7a72 100644 --- a/src/cf/ressearch.m4 +++ b/src/cf/ressearch.m4 @@ -1,19 +1,17 @@ AC_DEFUN([AC_CHECK_RESOLV_RETRANS],[ AC_CACHE_CHECK([for retransmit support in res_state], [ac_cv_res_retransretry],[ - AC_TRY_COMPILE( [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #if defined(__sun__) #include #endif #include #include -],[ +]], [[ _res.retrans = 2; _res.retry = 1; -], - [ac_cv_res_retransretry="yes"], - [ac_cv_res_retransretry="no"]) +]])],[ac_cv_res_retransretry="yes"],[ac_cv_res_retransretry="no"]) ]) AS_IF([test "$ac_cv_res_retransretry" = "yes"], [AC_DEFINE([HAVE_RES_RETRANSRETRY], 1, @@ -23,15 +21,14 @@ AC_DEFUN([AC_CHECK_RESOLV_RETRANS],[ AC_DEFUN([AC_FUNC_RES_SEARCH], [ ac_cv_func_res_search=no - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include #include #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif -#include ], - [ +#include ]], [[ const char host[11]="openafs.org"; u_char ans[1024]; int r; @@ -41,6 +38,5 @@ res_init(); */ r = res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans)); return 0; - ], - ac_cv_func_res_search=yes) + ]])],[ac_cv_func_res_search=yes],[]) ]) diff --git a/src/cf/retsigtype.m4 b/src/cf/retsigtype.m4 index ab8577b..72b7ec6 100644 --- a/src/cf/retsigtype.m4 +++ b/src/cf/retsigtype.m4 @@ -5,7 +5,18 @@ dnl Figure out return type of signal handlers, and define SIGRETURN macro dnl that can be used to return from one dnl AC_DEFUN([OPENAFS_RETSIGTYPE],[ -AC_TYPE_SIGNAL +AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void. +Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl +AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([#include +#include +], + [return *(signal (0, 0)) (0) == 1;])], + [ac_cv_type_signal=int], + [ac_cv_type_signal=void])]) +AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers + (`int' or `void').]) + if test "$ac_cv_type_signal" = "void" ; then AC_DEFINE(VOID_RETSIGTYPE, 1, [Define if signal handlers return void.]) fi diff --git a/src/cf/roken.m4 b/src/cf/roken.m4 index 7826b0f..9a937c4 100644 --- a/src/cf/roken.m4 +++ b/src/cf/roken.m4 @@ -88,7 +88,7 @@ AC_DEFUN([OPENAFS_ROKEN], [ [AS_HELP_STRING([--with-roken=DIR], [Location of the roken library, or 'internal'])], [AS_IF([test x"$withval" = xno], - [AC_ERROR("OpenAFS requires roken to build")], + [AC_MSG_ERROR("OpenAFS requires roken to build")], [AS_IF([test x"$withval" != xyes], [roken_root="$withval"]) ]) diff --git a/src/cf/sizet.m4 b/src/cf/sizet.m4 index 1a0e788..2851744 100644 --- a/src/cf/sizet.m4 +++ b/src/cf/sizet.m4 @@ -2,7 +2,7 @@ AC_DEFUN([OPENAFS_PRINTF_TAKES_Z_LEN], [ AC_CACHE_CHECK([whether printf understands the %z length modifier], [openafs_cv_printf_takes_z], [ - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include @@ -15,10 +15,7 @@ int main(void) { } else { return 1; } -}], - [openafs_cv_printf_takes_z="yes"], - [openafs_cv_printf_takes_z="no"], - [openafs_cv_printf_takes_z="no"]) +}]])],[openafs_cv_printf_takes_z="yes"],[openafs_cv_printf_takes_z="no"],[openafs_cv_printf_takes_z="no"]) ]) if test "x$openafs_cv_printf_takes_z" = "xyes"; then diff --git a/src/cf/socket.m4 b/src/cf/socket.m4 index 466f423..fc84365 100644 --- a/src/cf/socket.m4 +++ b/src/cf/socket.m4 @@ -1,11 +1,8 @@ AC_DEFUN([OPENAFS_SOCKET_CHECKS],[ 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_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include +#include ]], [[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, @@ -15,14 +12,11 @@ AS_IF([test "$ac_cv_sockaddr_len" = "yes"], AC_DEFUN([OPENAFS_SOCKOPT_CHECK],[ AC_CACHE_CHECK([for setsockopt(, SOL_IP, IP_RECVERR)], [ac_cv_setsockopt_iprecverr], - [AC_TRY_COMPILE( [ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #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])]) +#include ]], [[int on=1; +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([HAVE_SETSOCKOPT_IP_RECVERR], [1], diff --git a/src/cf/solaris-dqrwlock.m4 b/src/cf/solaris-dqrwlock.m4 index 69c654f..983e0c2 100644 --- a/src/cf/solaris-dqrwlock.m4 +++ b/src/cf/solaris-dqrwlock.m4 @@ -1,13 +1,9 @@ AC_DEFUN([SOLARIS_UFSVFS_HAS_DQRWLOCK], [ AC_CACHE_CHECK([for vfs_dqrwlock in struct ufsvfs], [ac_cv_solaris_ufsvfs_has_dqrwlock], - [AC_TRY_COMPILE( - [#define _KERNEL -#include ], - [struct ufsvfs _ufsvfs; -(void) _ufsvfs.vfs_dqrwlock;], - [ac_cv_solaris_ufsvfs_has_dqrwlock=yes], - [ac_cv_solaris_ufsvfs_has_dqrwlock=no]) + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _KERNEL +#include ]], [[struct ufsvfs _ufsvfs; +(void) _ufsvfs.vfs_dqrwlock;]])],[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, diff --git a/src/cf/solaris-fs-rolled.m4 b/src/cf/solaris-fs-rolled.m4 index 0a0ea42..f3ce630 100644 --- a/src/cf/solaris-fs-rolled.m4 +++ b/src/cf/solaris-fs-rolled.m4 @@ -1,10 +1,7 @@ AC_DEFUN([SOLARIS_FS_HAS_FS_ROLLED], [ 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]) + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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, diff --git a/src/cf/solaris-solookup.m4 b/src/cf/solaris-solookup.m4 index 4eb53f1..d32bf26 100644 --- a/src/cf/solaris-solookup.m4 +++ b/src/cf/solaris-solookup.m4 @@ -1,14 +1,10 @@ AC_DEFUN([SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS], [ AC_CACHE_CHECK([whether solookup takes a sockparams], [ac_cv_solaris_solookup_takes_sockparams], - [AC_TRY_COMPILE( - [#define _KERNEL + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _KERNEL #include -#include ], - [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]) +#include ]], [[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]) ]) AS_IF([test "$ac_cv_solaris_solookup_takes_sockparams" = "yes"], [AC_DEFINE(SOLOOKUP_TAKES_SOCKPARAMS, 1, diff --git a/src/cf/solaris-test1.m4 b/src/cf/solaris-test1.m4 index a0b572e..0e11c10 100644 --- a/src/cf/solaris-test1.m4 +++ b/src/cf/solaris-test1.m4 @@ -12,10 +12,7 @@ AC_DEFUN([SOLARIS_CC_TAKES_XVECTOR_NONE], [ [ac_cv_solaris_cc_takes_xvector_none], [save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -xvector=%none" - AC_TRY_COMPILE([], - [int x;], - [ac_cv_solaris_cc_takes_xvector_none=yes], - [ac_cv_solaris_cc_takes_xvector_none=no]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int x;]])],[ac_cv_solaris_cc_takes_xvector_none=yes],[ac_cv_solaris_cc_takes_xvector_none=no]) CFLAGS="$save_CFLAGS" ]) diff --git a/src/cf/test_package.m4 b/src/cf/test_package.m4 index 5afe81a..9fc3f8b 100644 --- a/src/cf/test_package.m4 +++ b/src/cf/test_package.m4 @@ -54,11 +54,11 @@ save_LIBS="$LIBS" ires= lres= for i in $header_dirs; do CFLAGS="-I$i $save_CFLAGS" - AC_TRY_COMPILE([$2],,ires=$i;break) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$2]], [[]])],[ires=$i;break],[]) done for i in $lib_dirs; do LIBS="-L$i $3 $4 $save_LIBS" - AC_TRY_LINK([$2],,lres=$i;break) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]], [[]])],[lres=$i;break],[]) done CFLAGS="$save_CFLAGS" LIBS="$save_LIBS" diff --git a/src/cf/types.m4 b/src/cf/types.m4 index fa65b01..5036613 100644 --- a/src/cf/types.m4 +++ b/src/cf/types.m4 @@ -4,7 +4,18 @@ LIBS="$save_LIBS" openafs_cv_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $XCFLAGS_NOCHECKING" -AC_TYPE_SIGNAL +AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void. +Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl +AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([#include +#include +], + [return *(signal (0, 0)) (0) == 1;])], + [ac_cv_type_signal=int], + [ac_cv_type_signal=void])]) +AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers + (`int' or `void').]) + OPENAFS_RETSIGTYPE AC_CHECK_SIZEOF(void *) AC_CHECK_SIZEOF(unsigned long long) @@ -50,7 +61,7 @@ AC_CHECK_TYPES([struct addrinfo], [], [], [ ]) AC_CHECK_TYPES([long long], [], [], []) -AC_SIZEOF_TYPE(long) +AC_CHECK_SIZEOF([long]) CFLAGS="$openafs_cv_saved_CFLAGS" ]) diff --git a/src/cf/ucontext.m4 b/src/cf/ucontext.m4 index e6c7025..05f867a 100644 --- a/src/cf/ucontext.m4 +++ b/src/cf/ucontext.m4 @@ -4,7 +4,7 @@ dnl and return to the original user context. dnl AC_DEFUN([OPENAFS_WORKING_UCONTEXT],[ AC_MSG_CHECKING([if user context manipulation is complete]) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include #ifdef HAVE_UCONTEXT_H @@ -47,6 +47,5 @@ main(int argc, char **argv) free(alt_stack); exit(EXIT_SUCCESS); -}],AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_WORKING_SWAPCONTEXT],[1],[user context manipulation is complete]), - AC_MSG_RESULT([no]))]) +}]])],[AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_WORKING_SWAPCONTEXT,1,user context manipulation is complete)],[AC_MSG_RESULT(no)],[])]) -- 1.9.4