From d281eb242414f58440dc44cf82d4fe7dc7830bc8 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Sat, 26 May 2018 19:52:27 -0400 Subject: [PATCH] autoconf: reformat long lines The autoupdate tool was run to modernize the autoconf macros but generates very long lines. Manually reformat the long lines to make them more reasonable. Reviewed-on: https://gerrit.openafs.org/13125 Reviewed-by: Michael Meffie Reviewed-by: Andrew Deason Tested-by: BuildBot Reviewed-by: Marcio Brito Barbosa Reviewed-by: Benjamin Kaduk (cherry picked from commit 451602a5e3a503d46eaecb3738d259e46023afcd) Change-Id: I19f16a66fdc6b33889f08e5a095b1f3209b01a3c Reviewed-on: https://gerrit.openafs.org/13484 Reviewed-by: Michael Meffie Reviewed-by: Andrew Deason Reviewed-by: Marcio Brito Barbosa Reviewed-by: Cheyenne Wills Reviewed-by: Mark Vitale Tested-by: BuildBot Reviewed-by: Stephan Wiesand --- src/cf/bigendian.m4 | 5 ++++- src/cf/c-atomic.m4 | 7 ++++++- src/cf/c-struct-label.m4 | 3 ++- src/cf/hcrypto.m4 | 12 +++++++++--- src/cf/irix-test.m4 | 12 ++++++++---- src/cf/library.m4 | 13 +++++++++---- src/cf/linux-test5.m4 | 35 ++++++++++++++++++++++++++++++----- src/cf/sizet.m4 | 13 +++++++++---- src/cf/socket.m4 | 23 ++++++++++++++++------- src/cf/solaris-dqrwlock.m4 | 11 ++++++++--- src/cf/solaris-fs-rolled.m4 | 7 ++++++- src/cf/solaris-solookup.m4 | 13 +++++++++---- src/cf/solaris-test1.m4 | 5 ++++- src/cf/ucontext.m4 | 13 ++++++++++--- 14 files changed, 130 insertions(+), 42 deletions(-) diff --git a/src/cf/bigendian.m4 b/src/cf/bigendian.m4 index 6c7ae80d8..768d468ff 100644 --- a/src/cf/bigendian.m4 +++ b/src/cf/bigendian.m4 @@ -41,7 +41,10 @@ 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 4b443b4a7..aab210560 100644 --- a/src/cf/c-atomic.m4 +++ b/src/cf/c-atomic.m4 @@ -1,7 +1,12 @@ AC_DEFUN([OPENAFS_C_ATOMIC_CHECKS], [ AC_CACHE_CHECK([if compiler has __sync_add_and_fetch], [ac_cv_sync_fetch_and_add], - [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]) + [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 2c728ecd6..67f3c256e 100644 --- a/src/cf/c-struct-label.m4 +++ b/src/cf/c-struct-label.m4 @@ -10,7 +10,8 @@ struct labeltest struct_labeltest = { .open = osi_UFSOpen, } ]])],[AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STRUCT_LABEL_SUPPORT, 1, [Define to 1 if your compiler supports labels in structs.]) + AC_DEFINE(HAVE_STRUCT_LABEL_SUPPORT, 1, + [Define to 1 if your compiler supports labels in structs.]) ],[AC_MSG_RESULT(no) ]) ]) diff --git a/src/cf/hcrypto.m4 b/src/cf/hcrypto.m4 index 79d6843c3..66502627e 100644 --- a/src/cf/hcrypto.m4 +++ b/src/cf/hcrypto.m4 @@ -83,18 +83,24 @@ AC_DEFUN([OPENAFS_HCRYPTO], [ AC_SUBST(hcrypto_install_target) AC_ARG_WITH([hcrypto], - [AS_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_MSG_ERROR("OpenAFS requires hcrypto to build")], [AS_IF([test x"$withval" != xyes], [hcrypto_root="$withval"])])] ) AC_ARG_WITH([hcrypto-include], - [AS_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], - [AS_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 95dd9f20c..a07112d9e 100644 --- a/src/cf/irix-test.m4 +++ b/src/cf/irix-test.m4 @@ -1,12 +1,16 @@ AC_DEFUN([IRIX_SYS_SYSTM_H_HAS_MEM_FUNCS], [ 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_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]) + 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 95af14f71..c2c31affa 100644 --- a/src/cf/library.m4 +++ b/src/cf/library.m4 @@ -8,7 +8,9 @@ else dnl darwin wants it, aix hates it AC_MSG_CHECKING(for the useability of arpa/nameser_compat.h) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ #include #include #include @@ -18,9 +20,12 @@ 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" AC_MSG_CHECKING([for res_search]) diff --git a/src/cf/linux-test5.m4 b/src/cf/linux-test5.m4 index 8b99d57b3..59bdbfc80 100644 --- a/src/cf/linux-test5.m4 +++ b/src/cf/linux-test5.m4 @@ -5,7 +5,12 @@ AC_DEFUN([OPENAFS_GCC_SUPPORTS_MARCH], [ [openafs_cv_gcc_supports_march], [save_CFLAGS="$CFLAGS" CFLAGS="-MARCH=pentium" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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], @@ -18,7 +23,12 @@ AC_DEFUN([OPENAFS_GCC_NEEDS_NO_STRICT_ALIASING], [ [openafs_cv_gcc_needs_no_strict_aliasing], [save_CFLAGS="$CFLAGS" CFLAGS="-fno-strict-aliasing" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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], @@ -30,7 +40,12 @@ AC_DEFUN([OPENAFS_GCC_NEEDS_NO_STRENGTH_REDUCE], [ [openafs_cv_gcc_needs_no_strength_reduce], [save_CFLAGS="$CFLAGS" CFLAGS="-fno-strength-reduce" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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], @@ -42,7 +57,12 @@ AC_DEFUN([OPENAFS_GCC_SUPPORTS_NO_COMMON], [ [openafs_cv_gcc_supports_no_common], [save_CFLAGS="$CFLAGS" CFLAGS="-fno-common" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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" ]) @@ -55,7 +75,12 @@ AC_DEFUN([OPENAFS_GCC_SUPPORTS_PIPE], [ [openafs_cv_gcc_supports_pipe], [save_CFLAGS="$CFLAGS" CFLAGS="-pipe" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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/sizet.m4 b/src/cf/sizet.m4 index 285174430..e61649d6b 100644 --- a/src/cf/sizet.m4 +++ b/src/cf/sizet.m4 @@ -1,8 +1,9 @@ AC_DEFUN([OPENAFS_PRINTF_TAKES_Z_LEN], [ AC_CACHE_CHECK([whether printf understands the %z length modifier], -[openafs_cv_printf_takes_z], [ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ +[openafs_cv_printf_takes_z], + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include #include @@ -15,10 +16,14 @@ 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 - AC_DEFINE([PRINTF_TAKES_Z_LEN], 1, [define if printf and friends understand the %z length modifier]) + AC_DEFINE([PRINTF_TAKES_Z_LEN], 1, + [define if printf and friends understand the %z length modifier]) fi ]) diff --git a/src/cf/socket.m4 b/src/cf/socket.m4 index fc843653f..f10f14ecc 100644 --- a/src/cf/socket.m4 +++ b/src/cf/socket.m4 @@ -1,8 +1,13 @@ AC_DEFUN([OPENAFS_SOCKET_CHECKS],[ AC_CACHE_CHECK([if struct sockaddr has sa_len field], [ac_cv_sockaddr_len], - [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]) + [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, @@ -12,11 +17,15 @@ 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_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])]) + [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])]) 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 983e0c292..19f5dca0a 100644 --- a/src/cf/solaris-dqrwlock.m4 +++ b/src/cf/solaris-dqrwlock.m4 @@ -1,9 +1,14 @@ AC_DEFUN([SOLARIS_UFSVFS_HAS_DQRWLOCK], [ AC_CACHE_CHECK([for vfs_dqrwlock in struct ufsvfs], [ac_cv_solaris_ufsvfs_has_dqrwlock], - [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]) + [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 f3ce6304c..17f0326a9 100644 --- a/src/cf/solaris-fs-rolled.m4 +++ b/src/cf/solaris-fs-rolled.m4 @@ -1,7 +1,12 @@ AC_DEFUN([SOLARIS_FS_HAS_FS_ROLLED], [ AC_CACHE_CHECK([for fs_rolled in struct proc], [ac_cv_solaris_fs_has_fs_rolled], - [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]) + [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 d32bf26ce..b804894c0 100644 --- a/src/cf/solaris-solookup.m4 +++ b/src/cf/solaris-solookup.m4 @@ -1,10 +1,15 @@ AC_DEFUN([SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS], [ AC_CACHE_CHECK([whether solookup takes a sockparams], [ac_cv_solaris_solookup_takes_sockparams], - [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]) + [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]) ]) 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 0e11c1039..89fbdffa4 100644 --- a/src/cf/solaris-test1.m4 +++ b/src/cf/solaris-test1.m4 @@ -12,7 +12,10 @@ AC_DEFUN([SOLARIS_CC_TAKES_XVECTOR_NONE], [ [ac_cv_solaris_cc_takes_xvector_none], [save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -xvector=%none" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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/ucontext.m4 b/src/cf/ucontext.m4 index 05f867afc..73b3e623f 100644 --- a/src/cf/ucontext.m4 +++ b/src/cf/ucontext.m4 @@ -4,7 +4,9 @@ dnl and return to the original user context. dnl AC_DEFUN([OPENAFS_WORKING_UCONTEXT],[ AC_MSG_CHECKING([if user context manipulation is complete]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + AC_RUN_IFELSE( + [AC_LANG_SOURCE( + [[ #include #include #ifdef HAVE_UCONTEXT_H @@ -47,5 +49,10 @@ 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)], + [])]) -- 2.39.5