From: Viktor Szakats Date: Wed, 28 Aug 2024 16:01:27 +0000 (+0200) Subject: tidy-up: indentation in autotools sources X-Git-Tag: curl-8_11_0~342 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68a224c2911131a92b06220a9916c56c6f513a84;p=thirdparty%2Fcurl.git tidy-up: indentation in autotools sources Indentation in `configure.ac` and `.m4` files. Closes #14692 --- diff --git a/acinclude.m4 b/acinclude.m4 index 936749dd54..575a8f309a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -49,9 +49,9 @@ AC_DEFUN([CURL_CHECK_DEF], [ AC_PREPROC_IFELSE([ AC_LANG_SOURCE( ifelse($2,,,[$2])[[ -#ifdef $1 -CURL_DEF_TOKEN $1 -#endif + #ifdef $1 + CURL_DEF_TOKEN $1 + #endif ]]) ],[ tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ @@ -89,14 +89,14 @@ AC_DEFUN([CURL_CHECK_DEF_CC], [ AC_COMPILE_IFELSE([ AC_LANG_SOURCE( ifelse($2,,,[$2])[[ -int main (void) -{ -#ifdef $1 - return 0; -#else - #error force compilation error -#endif -} + int main(void) + { + #ifdef $1 + return 0; + #else + #error force compilation error + #endif + } ]]) ],[ tst_symbol_defined="yes" @@ -123,16 +123,16 @@ AC_DEFUN([CURL_CHECK_LIB_XNET], [ tst_lib_xnet_required="no" AC_COMPILE_IFELSE([ AC_LANG_SOURCE([[ -int main (void) -{ -#if defined(__hpux) && defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600) - return 0; -#elif defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED) - return 0; -#else - #error force compilation error -#endif -} + int main(void) + { + #if defined(__hpux) && defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600) + return 0; + #elif defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED) + return 0; + #else + #error force compilation error + #endif + } ]]) ],[ tst_lib_xnet_required="yes" @@ -179,11 +179,11 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ ]],[[ -#ifdef _WIN32 - int dummy=1; -#else - #error Not a native Windows build target. -#endif + #ifdef _WIN32 + int dummy=1; + #else + #error Not a native Windows build target. + #endif ]]) ],[ curl_cv_native_windows="yes" @@ -205,21 +205,21 @@ AC_DEFUN([CURL_CHECK_HEADER_LBER], [ AC_CACHE_CHECK([for lber.h], [curl_cv_header_lber_h], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#endif -#ifndef NULL -#define NULL (void *)0 -#endif -#include + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #endif + #ifndef NULL + #define NULL (void *)0 + #endif + #include ]],[[ BerValue *bvp = NULL; BerElement *bep = ber_init(bvp); @@ -237,24 +237,24 @@ AC_DEFUN([CURL_CHECK_HEADER_LBER], [ # AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#endif -#ifndef NULL -#define NULL (void *)0 -#endif -#ifndef LDAP_DEPRECATED -#define LDAP_DEPRECATED 1 -#endif -#include + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #endif + #ifndef NULL + #define NULL (void *)0 + #endif + #ifndef LDAP_DEPRECATED + #define LDAP_DEPRECATED 1 + #endif + #include ]],[[ BerValue *bvp = NULL; BerElement *bep = ber_init(bvp); @@ -285,24 +285,24 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAP], [ AC_CACHE_CHECK([for ldap.h], [curl_cv_header_ldap_h], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#endif -#ifndef LDAP_DEPRECATED -#define LDAP_DEPRECATED 1 -#endif -#ifdef NEED_LBER_H -#include -#endif -#include + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #endif + #ifndef LDAP_DEPRECATED + #define LDAP_DEPRECATED 1 + #endif + #ifdef NEED_LBER_H + #include + #endif + #include ]],[[ LDAP *ldp = ldap_init("0.0.0.0", LDAP_PORT); int res = ldap_unbind(ldp); @@ -331,27 +331,27 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAP_SSL], [ AC_CACHE_CHECK([for ldap_ssl.h], [curl_cv_header_ldap_ssl_h], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#endif -#ifndef LDAP_DEPRECATED -#define LDAP_DEPRECATED 1 -#endif -#ifdef NEED_LBER_H -#include -#endif -#ifdef HAVE_LDAP_H -#include -#endif -#include + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #endif + #ifndef LDAP_DEPRECATED + #define LDAP_DEPRECATED 1 + #endif + #ifdef NEED_LBER_H + #include + #endif + #ifdef HAVE_LDAP_H + #include + #endif + #include ]],[[ LDAP *ldp = ldapssl_init("0.0.0.0", LDAPS_PORT, 1); ]]) @@ -416,17 +416,17 @@ AC_DEFUN([CURL_CHECK_LIBS_WINLDAP], [ fi AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#include -#ifdef HAVE_WINBER_H -#include -#endif -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #include + #ifdef HAVE_WINBER_H + #include + #endif + #endif ]],[[ BERVAL *bvp = NULL; BerElement *bep = ber_init(bvp); @@ -514,29 +514,29 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [ fi AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#endif -#ifndef NULL -#define NULL (void *)0 -#endif -#ifndef LDAP_DEPRECATED -#define LDAP_DEPRECATED 1 -#endif -#ifdef NEED_LBER_H -#include -#endif -#ifdef HAVE_LDAP_H -#include -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #endif + #ifndef NULL + #define NULL (void *)0 + #endif + #ifndef LDAP_DEPRECATED + #define LDAP_DEPRECATED 1 + #endif + #ifdef NEED_LBER_H + #include + #endif + #ifdef HAVE_LDAP_H + #include + #endif ]],[[ BerValue *bvp = NULL; BerElement *bep = ber_init(bvp); @@ -583,26 +583,26 @@ AC_DEFUN([TYPE_SOCKADDR_STORAGE], AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [if struct sockaddr_storage is defined]), , [ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #ifdef HAVE_NETINET_IN_H + #include + #endif + #ifdef HAVE_ARPA_INET_H + #include + #endif + #endif ]) ]) @@ -618,21 +618,21 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ AC_MSG_CHECKING([for recv]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -$curl_includes_bsdsocket -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + $curl_includes_bsdsocket + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #endif ]],[[ recv(0, 0, 0, 0); ]]) @@ -666,21 +666,21 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [ AC_MSG_CHECKING([for send]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -$curl_includes_bsdsocket -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + $curl_includes_bsdsocket + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #endif ]],[[ send(0, 0, 0, 0); ]]) @@ -710,20 +710,20 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [ AC_CACHE_CHECK([for MSG_NOSIGNAL], [curl_cv_msg_nosignal], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #endif ]],[[ int flag=MSG_NOSIGNAL; ]]) @@ -752,23 +752,23 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [ AC_CACHE_CHECK([for struct timeval], [curl_cv_struct_timeval], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#include -#ifdef HAVE_SYS_SOCKET_H -#include -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #endif + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_TIME_H + #include + #endif + #include + #ifdef HAVE_SYS_SOCKET_H + #include + #endif ]],[[ struct timeval ts; ts.tv_sec = 0; @@ -804,26 +804,26 @@ AC_DEFUN([TYPE_IN_ADDR_T], [ if test "$curl_cv_in_addr_t_equiv" = "unknown"; then AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #ifdef HAVE_NETINET_IN_H + #include + #endif + #ifdef HAVE_ARPA_INET_H + #include + #endif + #endif ]],[[ $t data = inet_addr ("1.2.3.4"); ]]) @@ -843,26 +843,26 @@ AC_DEFUN([TYPE_IN_ADDR_T], [ ;; esac ],[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #else + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #ifdef HAVE_NETINET_IN_H + #include + #endif + #ifdef HAVE_ARPA_INET_H + #include + #endif + #endif ]) ]) @@ -878,13 +878,13 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC], [ if test "x$dontwant_rt" = "xno" ; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#include + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_TIME_H + #include + #endif + #include ]],[[ struct timespec ts; (void)clock_gettime(CLOCK_MONOTONIC, &ts); @@ -912,13 +912,13 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC_RAW], [ if test "x$dontwant_rt" = "xno" ; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#include + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_TIME_H + #include + #endif + #include ]],[[ struct timespec ts; (void)clock_gettime(CLOCK_MONOTONIC_RAW, &ts); @@ -958,13 +958,13 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [ fi AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#include + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_TIME_H + #include + #endif + #include ]],[[ struct timespec ts; (void)clock_gettime(CLOCK_MONOTONIC, &ts); @@ -1004,14 +1004,14 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [ AC_MSG_CHECKING([if monotonic clock_gettime works]) CURL_RUN_IFELSE([ AC_LANG_PROGRAM([[ -#include -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#include + #include + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_TIME_H + #include + #endif + #include ]],[[ struct timespec ts; if (0 == clock_gettime(CLOCK_MONOTONIC, &ts)) @@ -1101,31 +1101,31 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ AC_MSG_CHECKING([for select]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#include -#ifndef _WIN32 -#ifdef HAVE_SYS_SELECT_H -#include -#elif defined(HAVE_UNISTD_H) -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -$curl_includes_bsdsocket -#endif + #undef inline + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #endif + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_SYS_TIME_H + #include + #endif + #include + #ifndef _WIN32 + #ifdef HAVE_SYS_SELECT_H + #include + #elif defined(HAVE_UNISTD_H) + #include + #endif + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + $curl_includes_bsdsocket + #endif ]],[[ select(0, 0, 0, 0, 0); ]]) @@ -1164,11 +1164,11 @@ AC_DEFUN([CURL_VERIFY_RUNTIMELIBS], [ dnl point also is available run-time! AC_MSG_CHECKING([run-time libs availability]) CURL_RUN_IFELSE([ -int main() -{ - return 0; -} -], + int main() + { + return 0; + } + ], AC_MSG_RESULT([fine]), AC_MSG_RESULT([failed]) AC_MSG_ERROR([one or more libs available at link-time are not available run-time. Libs used at link-time: $LIBS]) @@ -1381,11 +1381,11 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ ]],[[ -#if !defined(_WIN32_WCE) && (defined(__MINGW32__) || defined(_MSC_VER)) - int dummy=1; -#else - #error Win32 large file API not supported. -#endif + #if !defined(_WIN32_WCE) && (defined(__MINGW32__) || defined(_MSC_VER)) + int dummy=1; + #else + #error Win32 large file API not supported. + #endif ]]) ],[ curl_win32_file_api="win32_large_files" @@ -1395,11 +1395,11 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ ]],[[ -#if defined(_WIN32_WCE) || defined(__MINGW32__) || defined(_MSC_VER) - int dummy=1; -#else - #error Win32 small file API not supported. -#endif + #if defined(_WIN32_WCE) || defined(__MINGW32__) || defined(_MSC_VER) + int dummy=1; + #else + #error Win32 small file API not supported. + #endif ]]) ],[ curl_win32_file_api="win32_small_files" @@ -1436,12 +1436,12 @@ AC_DEFUN([CURL_CHECK_WIN32_CRYPTO], [ if test "$curl_cv_native_windows" = "yes"; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#include + #undef inline + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #include ]],[[ HCRYPTPROV hCryptProv; if(CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, diff --git a/configure.ac b/configure.ac index 46bb8bca0a..f96c6f5246 100644 --- a/configure.ac +++ b/configure.ac @@ -1250,12 +1250,12 @@ if test "$HAVE_GETHOSTBYNAME" != "1"; then AC_MSG_CHECKING([for gethostbyname in $winsock_LIB]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#endif + #ifdef _WIN32 + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + #endif ]],[[ gethostbyname("localhost"); ]]) @@ -1276,8 +1276,8 @@ if test "$HAVE_GETHOSTBYNAME" != "1"; then AC_MSG_CHECKING([for gethostbyname for Minix 3]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -/* Older Minix versions may need here instead */ -#include + /* Older Minix versions may need here instead */ + #include ]],[[ gethostbyname("localhost"); ]]) @@ -1294,8 +1294,8 @@ if test "$HAVE_GETHOSTBYNAME" != "1"; then AC_MSG_CHECKING([for gethostbyname for eCos]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#include -#include + #include + #include ]],[[ gethostbyname("localhost"); ]]) @@ -1780,27 +1780,27 @@ AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]), esac ], AC_RUN_IFELSE([AC_LANG_SOURCE([[ -/* are AF_INET6 and sockaddr_in6 available? */ -#include -#ifdef _WIN32 -#include -#include -#else -#include -#include -#if defined (__TANDEM) -# include -#endif -#endif - -int main(void) -{ - struct sockaddr_in6 s; - (void)s; - return socket(AF_INET6, SOCK_STREAM, 0) < 0; -} -]]) -], + /* are AF_INET6 and sockaddr_in6 available? */ + #include + #ifdef _WIN32 + #include + #include + #else + #include + #include + #if defined (__TANDEM) + # include + #endif + #endif + + int main(void) + { + struct sockaddr_in6 s; + (void)s; + return socket(AF_INET6, SOCK_STREAM, 0) < 0; + } + ]]) + ], AC_MSG_RESULT(yes) ipv6=yes, AC_MSG_RESULT(no) @@ -1817,20 +1817,20 @@ if test "$ipv6" = yes; then AC_MSG_CHECKING([if struct sockaddr_in6 has sin6_scope_id member]) AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#include -#ifdef _WIN32 -#include -#include -#else -#include -#if defined (__TANDEM) -# include -#endif -#endif -]], [[ - struct sockaddr_in6 s; - s.sin6_scope_id = 0; -]])], [ + #include + #ifdef _WIN32 + #include + #include + #else + #include + #if defined (__TANDEM) + # include + #endif + #endif + ]], [[ + struct sockaddr_in6 s; + s.sin6_scope_id = 0; + ]])], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID, 1, [Define to 1 if struct sockaddr_in6 has the sin6_scope_id member]) ], [ @@ -1953,10 +1953,10 @@ if test x"$want_gss" = xyes; then [], [not_mit=1], [ -AC_INCLUDES_DEFAULT -#ifdef HAVE_GSSAPI_GSSAPI_H -#include -#endif + AC_INCLUDES_DEFAULT + #ifdef HAVE_GSSAPI_GSSAPI_H + #include + #endif ]) if test "x$not_mit" = "x1"; then dnl MIT not found, check for Heimdal @@ -1974,9 +1974,9 @@ AC_INCLUDES_DEFAULT AC_MSG_CHECKING([if GSS-API headers declare GSS_C_NT_HOSTBASED_SERVICE]) AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#include -#include -#include + #include + #include + #include ]],[[ gss_import_name( (OM_uint32 *)0, @@ -3598,8 +3598,8 @@ if test X"$want_quiche" != Xno; then LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE quiche", [], [ -AC_INCLUDES_DEFAULT -#include + AC_INCLUDES_DEFAULT + #include ] ) ], diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 index 180b23417a..c70cbf2fd7 100644 --- a/m4/curl-compilers.m4 +++ b/m4/curl-compilers.m4 @@ -477,9 +477,9 @@ AC_DEFUN([CURL_COMPILER_WORKS_IFELSE], [ test "$tmp_compiler_works" = "yes"; then CURL_RUN_IFELSE([ AC_LANG_PROGRAM([[ -# ifdef __STDC__ -# include -# endif + #ifdef __STDC__ + # include + #endif ]],[[ int i = 0; exit(i); @@ -1401,7 +1401,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [ CFLAGS="$CFLAGS -fvisibility=hidden" AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -# include + #include ]],[[ printf("icc fvisibility bug test"); ]]) @@ -1481,7 +1481,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_PROTOTYPE_MISMATCH], [ AC_MSG_CHECKING([if compiler halts on function prototype mismatch]) AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -# include + #include int rand(int n); int rand(int n) { diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4 index 5ee1632c60..8109b76554 100644 --- a/m4/curl-confopts.m4 +++ b/m4/curl-confopts.m4 @@ -532,7 +532,7 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [ AC_MSG_CHECKING([that c-ares is good and recent enough]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#include + #include /* set of dummy functions in case c-ares was built with debug */ void curl_dofree() { } void curl_sclose() { } diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index 982fbb3fe5..2534fc5b46 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -1559,13 +1559,13 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ ]],[[ -#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) - return 0; -#elif defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 700) - return 0; -#else - #error force compilation error -#endif + #if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) + return 0; + #elif defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 700) + return 0; + #else + #error force compilation error + #endif ]]) ],[ tst_h_errno_sbs_issue_7="yes" diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4 index ad32b2ef0f..dfbbc3394d 100644 --- a/m4/curl-openssl.m4 +++ b/m4/curl-openssl.m4 @@ -384,14 +384,14 @@ dnl --- dnl Whether the OpenSSL configuration will be loaded automatically dnl --- if test X"$OPENSSL_ENABLED" = X"1"; then -AC_ARG_ENABLE(openssl-auto-load-config, + AC_ARG_ENABLE(openssl-auto-load-config, AS_HELP_STRING([--enable-openssl-auto-load-config],[Enable automatic loading of OpenSSL configuration]) AS_HELP_STRING([--disable-openssl-auto-load-config],[Disable automatic loading of OpenSSL configuration]), -[ if test X"$enableval" = X"no"; then - AC_MSG_NOTICE([automatic loading of OpenSSL configuration disabled]) - AC_DEFINE(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG, 1, [if the OpenSSL configuration won't be loaded automatically]) - fi -]) + [ if test X"$enableval" = X"no"; then + AC_MSG_NOTICE([automatic loading of OpenSSL configuration disabled]) + AC_DEFINE(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG, 1, [if the OpenSSL configuration won't be loaded automatically]) + fi + ]) fi dnl --- diff --git a/m4/curl-reentrant.m4 b/m4/curl-reentrant.m4 index 256f53c7da..b538710771 100644 --- a/m4/curl-reentrant.m4 +++ b/m4/curl-reentrant.m4 @@ -40,7 +40,7 @@ dnl makes errno available as a preprocessor macro. AC_DEFUN([CURL_CHECK_NEED_REENTRANT_ERRNO], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#include + #include ]],[[ if(0 != errno) return 1; @@ -53,27 +53,27 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_ERRNO], [ if test "$tmp_errno" = "yes"; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#include + #include ]],[[ -#ifdef errno - int dummy=1; -#else - #error force compilation error -#endif + #ifdef errno + int dummy=1; + #else + #error force compilation error + #endif ]]) ],[ tmp_errno="errno_macro_defined" ],[ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#define _REENTRANT -#include + #define _REENTRANT + #include ]],[[ -#ifdef errno - int dummy=1; -#else - #error force compilation error -#endif + #ifdef errno + int dummy=1; + #else + #error force compilation error + #endif ]]) ],[ tmp_errno="errno_macro_needs_reentrant" @@ -99,15 +99,15 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_GMTIME_R], [ ]) if test "$tmp_gmtime_r" = "yes"; then AC_EGREP_CPP([gmtime_r],[ -#include -#include + #include + #include ],[ tmp_gmtime_r="proto_declared" ],[ AC_EGREP_CPP([gmtime_r],[ -#define _REENTRANT -#include -#include + #define _REENTRANT + #include + #include ],[ tmp_gmtime_r="proto_needs_reentrant" tmp_need_reentrant="yes" @@ -132,15 +132,15 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_LOCALTIME_R], [ ]) if test "$tmp_localtime_r" = "yes"; then AC_EGREP_CPP([localtime_r],[ -#include -#include + #include + #include ],[ tmp_localtime_r="proto_declared" ],[ AC_EGREP_CPP([localtime_r],[ -#define _REENTRANT -#include -#include + #define _REENTRANT + #include + #include ],[ tmp_localtime_r="proto_needs_reentrant" tmp_need_reentrant="yes" @@ -165,15 +165,15 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_STRERROR_R], [ ]) if test "$tmp_strerror_r" = "yes"; then AC_EGREP_CPP([strerror_r],[ -#include -#include + #include + #include ],[ tmp_strerror_r="proto_declared" ],[ AC_EGREP_CPP([strerror_r],[ -#define _REENTRANT -#include -#include + #define _REENTRANT + #include + #include ],[ tmp_strerror_r="proto_needs_reentrant" tmp_need_reentrant="yes" @@ -198,15 +198,15 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_STRTOK_R], [ ]) if test "$tmp_strtok_r" = "yes"; then AC_EGREP_CPP([strtok_r],[ -#include -#include + #include + #include ],[ tmp_strtok_r="proto_declared" ],[ AC_EGREP_CPP([strtok_r],[ -#define _REENTRANT -#include -#include + #define _REENTRANT + #include + #include ],[ tmp_strtok_r="proto_needs_reentrant" tmp_need_reentrant="yes" @@ -231,15 +231,15 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_GETHOSTBYNAME_R], [ ]) if test "$tmp_gethostbyname_r" = "yes"; then AC_EGREP_CPP([gethostbyname_r],[ -#include -#include + #include + #include ],[ tmp_gethostbyname_r="proto_declared" ],[ AC_EGREP_CPP([gethostbyname_r],[ -#define _REENTRANT -#include -#include + #define _REENTRANT + #include + #include ],[ tmp_gethostbyname_r="proto_needs_reentrant" tmp_need_reentrant="yes" @@ -264,15 +264,15 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_GETPROTOBYNAME_R], [ ]) if test "$tmp_getprotobyname_r" = "yes"; then AC_EGREP_CPP([getprotobyname_r],[ -#include -#include + #include + #include ],[ tmp_getprotobyname_r="proto_declared" ],[ AC_EGREP_CPP([getprotobyname_r],[ -#define _REENTRANT -#include -#include + #define _REENTRANT + #include + #include ],[ tmp_getprotobyname_r="proto_needs_reentrant" tmp_need_reentrant="yes" @@ -410,11 +410,11 @@ AC_DEFUN([CURL_CONFIGURE_REENTRANT], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ ]],[[ -#ifdef _REENTRANT - int dummy=1; -#else - #error force compilation error -#endif + #ifdef _REENTRANT + int dummy=1; + #else + #error force compilation error + #endif ]]) ],[ AC_MSG_RESULT([yes]) @@ -470,11 +470,11 @@ AC_DEFUN([CURL_CONFIGURE_THREAD_SAFE], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ ]],[[ -#ifdef _THREAD_SAFE - int dummy=1; -#else - #error force compilation error -#endif + #ifdef _THREAD_SAFE + int dummy=1; + #else + #error force compilation error + #endif ]]) ],[ AC_MSG_RESULT([yes]) diff --git a/m4/curl-wolfssl.m4 b/m4/curl-wolfssl.m4 index b3f65ceef8..ca60d3b488 100644 --- a/m4/curl-wolfssl.m4 +++ b/m4/curl-wolfssl.m4 @@ -91,12 +91,12 @@ if test "x$OPT_WOLFSSL" != xno; then AC_MSG_CHECKING([for wolfSSL_Init in -lwolfssl]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -/* These are not needed for detection and confuse wolfSSL. - They are set up properly later if it is detected. */ -#undef SIZEOF_LONG -#undef SIZEOF_LONG_LONG -#include -#include + /* These are not needed for detection and confuse wolfSSL. + They are set up properly later if it is detected. */ + #undef SIZEOF_LONG + #undef SIZEOF_LONG_LONG + #include + #include ]],[[ return wolfSSL_Init(); ]])