fix underquoting of AC_LANG_PROGRAM arguments

3 files changed, 189 insertions, 189 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index c072b3166..c495cf637 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -29,19 +29,19 @@ dnl Check for compilable and valid windows.h header
 AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
   AC_CACHE_CHECK([for windows.h], [ac_cv_header_windows_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__)
         HAVE_WINDOWS_H shall not be defined.
 #else
         int dummy=2*WINVER;
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_windows_h="yes"
     ],[
@@ -70,14 +70,14 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [
       ac_cv_native_windows="no"
     else
       AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([
-        ],[
+        AC_LANG_PROGRAM([[
+        ]],[[
 #if defined(__MINGW32__) || defined(__MINGW32CE__)
           int dummy=1;
 #else
           Not a native Windows build target.
 #endif
-        ])
+        ]])
       ],[
         ac_cv_native_windows="yes"
       ],[
@@ -102,20 +102,20 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
   AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
   AC_CACHE_CHECK([for winsock.h], [ac_cv_header_winsock_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include <winsock.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__)
         HAVE_WINSOCK_H shall not be defined.
 #else
         int dummy=WSACleanup();
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_winsock_h="yes"
     ],[
@@ -139,20 +139,20 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
   AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
   AC_CACHE_CHECK([for winsock2.h], [ac_cv_header_winsock2_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include <winsock2.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__) || defined(__MINGW32CE__)
         HAVE_WINSOCK2_H shall not be defined.
 #else
         int dummy=2*IPPROTO_ESP;
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_winsock2_h="yes"
     ],[
@@ -176,7 +176,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
   AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
   AC_CACHE_CHECK([for ws2tcpip.h], [ac_cv_header_ws2tcpip_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -184,13 +184,13 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__) || defined(__MINGW32CE__)
         HAVE_WS2TCPIP_H shall not be defined.
 #else
         int dummy=2*IP_PKTINFO;
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_ws2tcpip_h="yes"
     ],[
@@ -214,7 +214,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINLDAP], [
   AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
   AC_CACHE_CHECK([for winldap.h], [ac_cv_header_winldap_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -223,14 +223,14 @@ AC_DEFUN([CURL_CHECK_HEADER_WINLDAP], [
 #include <windows.h>
 #endif
 #include <winldap.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__)
         HAVE_WINLDAP_H shall not be defined.
 #else
         LDAP *ldp = ldap_init("dummy", LDAP_PORT);
         ULONG res = ldap_unbind(ldp);
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_winldap_h="yes"
     ],[
@@ -254,7 +254,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINBER], [
   AC_REQUIRE([CURL_CHECK_HEADER_WINLDAP])dnl
   AC_CACHE_CHECK([for winber.h], [ac_cv_header_winber_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -264,7 +264,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINBER], [
 #endif
 #include <winldap.h>
 #include <winber.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__)
         HAVE_WINBER_H shall not be defined.
 #else
@@ -272,7 +272,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINBER], [
         BerElement *bep = ber_init(bvp);
         ber_free(bep, 1);
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_winber_h="yes"
     ],[
@@ -297,7 +297,7 @@ AC_DEFUN([CURL_CHECK_HEADER_LBER], [
   AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
   AC_CACHE_CHECK([for lber.h], [ac_cv_header_lber_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -313,11 +313,11 @@ AC_DEFUN([CURL_CHECK_HEADER_LBER], [
 #define NULL (void *)0
 #endif
 #include <lber.h>
-      ],[
+      ]],[[
         BerValue *bvp = NULL;
         BerElement *bep = ber_init(bvp);
         ber_free(bep, 1);
-      ])
+      ]])
     ],[
       ac_cv_header_lber_h="yes"
     ],[
@@ -329,7 +329,7 @@ AC_DEFUN([CURL_CHECK_HEADER_LBER], [
       [Define to 1 if you have the lber.h header file.])
     #
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -348,11 +348,11 @@ AC_DEFUN([CURL_CHECK_HEADER_LBER], [
 #define LDAP_DEPRECATED 1
 #endif
 #include <ldap.h>
-      ],[
+      ]],[[
         BerValue *bvp = NULL;
         BerElement *bep = ber_init(bvp);
         ber_free(bep, 1);
-      ])
+      ]])
     ],[
       curl_cv_need_header_lber_h="no"
     ],[
@@ -377,7 +377,7 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAP], [
   AC_REQUIRE([CURL_CHECK_HEADER_LBER])dnl
   AC_CACHE_CHECK([for ldap.h], [ac_cv_header_ldap_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -396,10 +396,10 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAP], [
 #include <lber.h>
 #endif
 #include <ldap.h>
-      ],[
+      ]],[[
         LDAP *ldp = ldap_init("dummy", LDAP_PORT);
         int res = ldap_unbind(ldp);
-      ])
+      ]])
     ],[
       ac_cv_header_ldap_h="yes"
     ],[
@@ -423,7 +423,7 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAP_SSL], [
   AC_REQUIRE([CURL_CHECK_HEADER_LDAP])dnl
   AC_CACHE_CHECK([for ldap_ssl.h], [ac_cv_header_ldap_ssl_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -445,9 +445,9 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAP_SSL], [
 #include <ldap.h>
 #endif
 #include <ldap_ssl.h>
-      ],[
+      ]],[[
         LDAP *ldp = ldapssl_init("dummy", LDAPS_PORT, 1);
-      ])
+      ]])
     ],[
       ac_cv_header_ldap_ssl_h="yes"
     ],[
@@ -471,7 +471,7 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAPSSL], [
   AC_REQUIRE([CURL_CHECK_HEADER_LDAP])dnl
   AC_CACHE_CHECK([for ldapssl.h], [ac_cv_header_ldapssl_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -496,10 +496,10 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAPSSL], [
 #include <ldap.h>
 #endif
 #include <ldapssl.h>
-      ],[
+      ]],[[
         char *cert_label = NULL;
         LDAP *ldp = ldap_ssl_init("dummy", LDAPS_PORT, cert_label);
-      ])
+      ]])
     ],[
       ac_cv_header_ldapssl_h="yes"
     ],[
@@ -559,7 +559,7 @@ AC_DEFUN([CURL_CHECK_LIBS_WINLDAP], [
       LIBS="$x_nlibs $curl_cv_save_LIBS"
     fi
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -573,13 +573,13 @@ AC_DEFUN([CURL_CHECK_LIBS_WINLDAP], [
 #include <winber.h>
 #endif
 #endif
-      ],[
+      ]],[[
         BERVAL *bvp = NULL;
         BerElement *bep = ber_init(bvp);
         LDAP *ldp = ldap_init("dummy", LDAP_PORT);
         ULONG res = ldap_unbind(ldp);
         ber_free(bep, 1);
-      ])
+      ]])
     ],[
       curl_cv_ldap_LIBS="$x_nlibs"
       break
@@ -656,7 +656,7 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [
       LIBS="$x_nlibs $curl_cv_save_LIBS"
     fi
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -680,13 +680,13 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [
 #ifdef HAVE_LDAP_H
 #include <ldap.h>
 #endif
-      ],[
+      ]],[[
         BerValue *bvp = NULL;
         BerElement *bep = ber_init(bvp);
         LDAP *ldp = ldap_init("dummy", LDAP_PORT);
         int res = ldap_unbind(ldp);
         ber_free(bep, 1);
-      ])
+      ]])
     ],[
       curl_cv_ldap_LIBS="$x_nlibs"
       break
@@ -723,14 +723,14 @@ dnl and check if it is needed even with stdlib.h
 AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [
   AC_CACHE_CHECK([for malloc.h], [ac_cv_header_malloc_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #include <malloc.h>
-      ],[
+      ]],[[
         void *p = malloc(10);
         void *q = calloc(10,10);
         free(p);
         free(q);
-      ])
+      ]])
     ],[
       ac_cv_header_malloc_h="yes"
     ],[
@@ -742,14 +742,14 @@ AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [
       [Define to 1 if you have the malloc.h header file.])
     #
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #include <stdlib.h>
-      ],[
+      ]],[[
         void *p = malloc(10);
         void *q = calloc(10,10);
         free(p);
         free(q);
-      ])
+      ]])
     ],[
       curl_cv_need_header_malloc_h="no"
     ],[
@@ -786,7 +786,7 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
         for arg2 in "struct sockaddr" void; do
           for t in int size_t unsigned long "unsigned long"; do
             AC_COMPILE_IFELSE([
-              AC_LANG_PROGRAM([
+              AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -811,10 +811,10 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
 #define GETPEERNCALLCONV
 #endif
                 extern int GETPEERNCALLCONV getpeername ($arg1, $arg2 *, $t *);
-              ],[
+              ]],[[
                 $t len=0;
                 getpeername(0,0,&len);
-              ])
+              ]])
             ],[
                curl_cv_socklen_t_equiv="$t"
                break 3
@@ -889,10 +889,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
   if test "$curl_cv_getnameinfo" != "yes"; then
     AC_MSG_CHECKING([deeper for getnameinfo])
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([
-      ],[
+      AC_LANG_PROGRAM([[
+      ]],[[
         getnameinfo();
-      ])
+      ]])
     ],[
       AC_MSG_RESULT([yes])
       curl_cv_getnameinfo="yes"
@@ -905,7 +905,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
   if test "$curl_cv_getnameinfo" != "yes"; then
     AC_MSG_CHECKING([deeper and deeper for getnameinfo])
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -929,9 +929,9 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
 #include <netdb.h>
 #endif
 #endif
-      ],[
+      ]],[[
         getnameinfo(0, 0, 0, 0, 0, 0, 0);
-      ])
+      ]])
     ],[
       AC_MSG_RESULT([yes])
       curl_cv_getnameinfo="yes"
@@ -950,7 +950,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
           for gni_arg46 in 'size_t' 'int' 'socklen_t' 'unsigned int' 'DWORD'; do
             for gni_arg7 in 'int' 'unsigned int'; do
               AC_COMPILE_IFELSE([
-                AC_LANG_PROGRAM([
+                AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -984,13 +984,13 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
                                          char *, $gni_arg46,
                                          char *, $gni_arg46,
                                          $gni_arg7);
-                ],[
+                ]],[[
                   $gni_arg2 salen=0;
                   $gni_arg46 hostlen=0;
                   $gni_arg46 servlen=0;
                   $gni_arg7 flags=0;
                   int res = getnameinfo(0, salen, 0, hostlen, 0, servlen, flags);
-                ])
+                ]])
               ],[
                  curl_cv_func_getnameinfo_args="$gni_arg1,$gni_arg2,$gni_arg46,$gni_arg7"
                  break 4
@@ -1111,7 +1111,7 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
   AC_CACHE_CHECK([for working NI_WITHSCOPEID], 
     [ac_cv_working_ni_withscopeid], [
     AC_RUN_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
@@ -1130,7 +1130,7 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-      ],[
+      ]],[[
 #if defined(NI_WITHSCOPEID) && defined(HAVE_GETNAMEINFO)
 #ifdef HAVE_STRUCT_SOCKADDR_STORAGE
         struct sockaddr_storage sa;
@@ -1161,7 +1161,7 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
 #else
         return 4; /* Error, NI_WITHSCOPEID not defined or no getnameinfo() */
 #endif
-      ]) # AC_LANG_PROGRAM
+      ]]) # AC_LANG_PROGRAM
     ],[
       # Exit code == 0. Program worked.
       ac_cv_working_ni_withscopeid="yes"
@@ -1172,13 +1172,13 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
       # Program is not run when cross-compiling. So we assume
       # NI_WITHSCOPEID will work if we are able to compile it.
       AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([
+        AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
-        ],[
+        ]],[[
           unsigned int dummy= NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
-        ])
+        ]])
       ],[
         ac_cv_working_ni_withscopeid="yes"
       ],[
@@ -1212,7 +1212,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
   #
   AC_MSG_CHECKING([for recv])
   AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([
+    AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1234,9 +1234,9 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
 #include <sys/socket.h>
 #endif
 #endif
-    ],[
+    ]],[[
       recv(0, 0, 0, 0);
-    ])
+    ]])
   ],[
     AC_MSG_RESULT([yes])
     curl_cv_recv="yes"
@@ -1255,7 +1255,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
             for recv_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do
               for recv_arg4 in 'int' 'unsigned int'; do
                 AC_COMPILE_IFELSE([
-                  AC_LANG_PROGRAM([
+                  AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1280,13 +1280,13 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
 #define RECVCALLCONV
 #endif
                     extern $recv_retv RECVCALLCONV recv($recv_arg1, $recv_arg2, $recv_arg3, $recv_arg4);
-                  ],[
+                  ]],[[
                     $recv_arg1 s=0;
                     $recv_arg2 buf=0;
                     $recv_arg3 len=0;
                     $recv_arg4 flags=0;
                     $recv_retv res = recv(s, buf, len, flags);
-                  ])
+                  ]])
                 ],[
                    curl_cv_func_recv_args="$recv_arg1,$recv_arg2,$recv_arg3,$recv_arg4,$recv_retv"
                    break 5
@@ -1344,7 +1344,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
   #
   AC_MSG_CHECKING([for send])
   AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([
+    AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1366,9 +1366,9 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
 #include <sys/socket.h>
 #endif
 #endif
-    ],[
+    ]],[[
       send(0, 0, 0, 0);
-    ])
+    ]])
   ],[
     AC_MSG_RESULT([yes])
     curl_cv_send="yes"
@@ -1387,7 +1387,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
             for send_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do
               for send_arg4 in 'int' 'unsigned int'; do
                 AC_COMPILE_IFELSE([
-                  AC_LANG_PROGRAM([
+                  AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1412,12 +1412,12 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
 #define SENDCALLCONV
 #endif
                     extern $send_retv SENDCALLCONV send($send_arg1, $send_arg2, $send_arg3, $send_arg4);
-                  ],[
+                  ]],[[
                     $send_arg1 s=0;
                     $send_arg3 len=0;
                     $send_arg4 flags=0;
                     $send_retv res = send(s, 0, len, flags);
-                  ])
+                  ]])
                 ],[
                    curl_cv_func_send_args="$send_arg1,$send_arg2,$send_arg3,$send_arg4,$send_retv"
                    break 5
@@ -1499,7 +1499,7 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
   AC_CHECK_HEADERS(sys/types.h sys/socket.h)
   AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1521,9 +1521,9 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
 #include <sys/socket.h>
 #endif
 #endif
-      ],[
+      ]],[[
         int flag=MSG_NOSIGNAL;
-      ])
+      ]])
     ],[
       ac_cv_msg_nosignal="yes"
     ],[
@@ -1550,7 +1550,7 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
   AC_CHECK_HEADERS(sys/types.h sys/time.h time.h)
   AC_CACHE_CHECK([for struct timeval], [ac_cv_struct_timeval], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1578,11 +1578,11 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
 #include <time.h>
 #endif
 #endif
-      ],[
+      ]],[[
         struct timeval ts;
         ts.tv_sec  = 0;
         ts.tv_usec = 0;
-      ])
+      ]])
     ],[
       ac_cv_struct_timeval="yes"
     ],[
@@ -1618,13 +1618,13 @@ AC_DEFUN([TYPE_SIG_ATOMIC_T], [
       #
       AC_MSG_CHECKING([if sig_atomic_t is already defined as volatile])
       AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
+        AC_LANG_PROGRAM([[
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-        ],[
+        ]],[[
           static volatile sig_atomic_t dummy = 0;
-        ])
+        ]])
       ],[
         AC_MSG_RESULT([no])
         ac_cv_sig_atomic_t_volatile="no"
@@ -1797,7 +1797,7 @@ AC_DEFUN([TYPE_IN_ADDR_T],
          curl_cv_in_addr_t_equiv=
          for t in "unsigned long" int size_t unsigned long; do
             AC_LINK_IFELSE([
-              AC_LANG_PROGRAM([
+              AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1825,9 +1825,9 @@ AC_DEFUN([TYPE_IN_ADDR_T],
 #include <arpa/inet.h>
 #endif
 #endif
-              ],[
+              ]],[[
                 $t data = inet_addr ("1.2.3.4");
-              ])
+              ]])
             ],[
               curl_cv_in_addr_t_equiv="$t"
               break
@@ -1881,7 +1881,7 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC], [
   AC_CHECK_HEADERS(sys/types.h sys/time.h time.h)
   AC_MSG_CHECKING([for monotonic clock_gettime])
   AC_COMPILE_IFELSE([
-    AC_LANG_PROGRAM([
+    AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -1895,10 +1895,10 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC], [
 #include <time.h>
 #endif
 #endif
-    ],[
+    ]],[[
       struct timespec ts;
       (void)clock_gettime(CLOCK_MONOTONIC, &ts);
-    ])
+    ]])
   ],[
     AC_MSG_RESULT([yes])
     ac_cv_func_clock_gettime="yes"
@@ -1932,7 +1932,7 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
         LIBS="$x_xlibs $curl_cv_save_LIBS"
       fi
       AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
+        AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -1946,10 +1946,10 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
 #include <time.h>
 #endif
 #endif
-        ],[
+        ]],[[
           struct timespec ts;
           (void)clock_gettime(CLOCK_MONOTONIC, &ts);
-        ])
+        ]])
       ],[
         curl_cv_gclk_LIBS="$x_xlibs"
         break
@@ -2009,7 +2009,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [
   #
   AC_MSG_CHECKING([for select])
   AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([
+    AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -2045,9 +2045,9 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [
 #include <sys/socket.h>
 #endif
 #endif
-    ],[
+    ]],[[
       select(0, 0, 0, 0, 0);
-    ])
+    ]])
   ],[
     AC_MSG_RESULT([yes])
     curl_cv_select="yes"
@@ -2065,7 +2065,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [
           for sel_arg234 in 'fd_set *' 'int *' 'void *'; do
             for sel_arg5 in 'struct timeval *' 'const struct timeval *'; do
               AC_COMPILE_IFELSE([
-                AC_LANG_PROGRAM([
+                AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -2114,13 +2114,13 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [
                                                          $sel_arg234,
                                                          $sel_arg234,
                                                          $sel_arg5);
-                ],[
+                ]],[[
                   $sel_arg1   nfds=0;
                   $sel_arg234 rfds=0;
                   $sel_arg234 wfds=0;
                   $sel_arg234 efds=0;
                   $sel_retv res = select(nfds, rfds, wfds, efds, 0);
-                ])
+                ]])
               ],[
                  curl_cv_func_select_args="$sel_arg1,$sel_arg234,$sel_arg5,$sel_retv"
                  break 4
@@ -2777,7 +2777,7 @@ AC_DEFUN([CURL_CHECK_VARIADIC_MACROS], [
   AC_CACHE_CHECK([for compiler support of C99 variadic macro style],
     [curl_cv_variadic_macros_c99], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #define c99_vmacro3(first, ...) fun3(first, __VA_ARGS__)
 #define c99_vmacro2(first, ...) fun2(first, __VA_ARGS__)
         int fun3(int arg1, int arg2, int arg3);
@@ -2786,10 +2786,10 @@ AC_DEFUN([CURL_CHECK_VARIADIC_MACROS], [
         { return arg1 + arg2 + arg3; }
         int fun2(int arg1, int arg2)
         { return arg1 + arg2; }
-      ],[
+      ]],[[
         int res3 = c99_vmacro3(1, 2, 3);
         int res2 = c99_vmacro2(1, 2);
-      ])
+      ]])
     ],[
       curl_cv_variadic_macros_c99="yes"
     ],[
@@ -2805,7 +2805,7 @@ AC_DEFUN([CURL_CHECK_VARIADIC_MACROS], [
   AC_CACHE_CHECK([for compiler support of old gcc variadic macro style],
     [curl_cv_variadic_macros_gcc], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #define gcc_vmacro3(first, args...) fun3(first, args)
 #define gcc_vmacro2(first, args...) fun2(first, args)
         int fun3(int arg1, int arg2, int arg3);
@@ -2814,10 +2814,10 @@ AC_DEFUN([CURL_CHECK_VARIADIC_MACROS], [
         { return arg1 + arg2 + arg3; }
         int fun2(int arg1, int arg2)
         { return arg1 + arg2; }
-      ],[
+      ]],[[
         int res3 = gcc_vmacro3(1, 2, 3);
         int res2 = gcc_vmacro2(1, 2);
-      ])
+      ]])
     ],[
       curl_cv_variadic_macros_gcc="yes"
     ],[
diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index ce37a38ef..310469f6d 100644
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -7,19 +7,19 @@ dnl Check for compilable and valid windows.h header
 AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
   AC_CACHE_CHECK([for windows.h], [ac_cv_header_windows_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__)
         HAVE_WINDOWS_H shall not be defined.
 #else
         int dummy=2*WINVER;
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_windows_h="yes"
     ],[
@@ -48,14 +48,14 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [
       ac_cv_native_windows="no"
     else
       AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([
-        ],[
+        AC_LANG_PROGRAM([[
+        ]],[[
 #if defined(__MINGW32__) || defined(__MINGW32CE__)
           int dummy=1;
 #else
           Not a native Windows build target.
 #endif
-        ])
+        ]])
       ],[
         ac_cv_native_windows="yes"
       ],[
@@ -80,20 +80,20 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
   AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
   AC_CACHE_CHECK([for winsock.h], [ac_cv_header_winsock_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include <winsock.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__)
         HAVE_WINSOCK_H shall not be defined.
 #else
         int dummy=WSACleanup();
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_winsock_h="yes"
     ],[
@@ -117,20 +117,20 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
   AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
   AC_CACHE_CHECK([for winsock2.h], [ac_cv_header_winsock2_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include <winsock2.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__) || defined(__MINGW32CE__)
         HAVE_WINSOCK2_H shall not be defined.
 #else
         int dummy=2*IPPROTO_ESP;
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_winsock2_h="yes"
     ],[
@@ -154,7 +154,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
   AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
   AC_CACHE_CHECK([for ws2tcpip.h], [ac_cv_header_ws2tcpip_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -162,13 +162,13 @@ AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
-      ],[
+      ]],[[
 #if defined(__CYGWIN__) || defined(__CEGCC__) || defined(__MINGW32CE__)
         HAVE_WS2TCPIP_H shall not be defined.
 #else
         int dummy=2*IP_PKTINFO;
 #endif
-      ])
+      ]])
     ],[
       ac_cv_header_ws2tcpip_h="yes"
     ],[
@@ -192,14 +192,14 @@ dnl and check if it is needed even with stdlib.h
 AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [
   AC_CACHE_CHECK([for malloc.h], [ac_cv_header_malloc_h], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #include <malloc.h>
-      ],[
+      ]],[[
         void *p = malloc(10);
         void *q = calloc(10,10);
         free(p);
         free(q);
-      ])
+      ]])
     ],[
       ac_cv_header_malloc_h="yes"
     ],[
@@ -211,14 +211,14 @@ AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [
       [Define to 1 if you have the malloc.h header file.])
     #
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #include <stdlib.h>
-      ],[
+      ]],[[
         void *p = malloc(10);
         void *q = calloc(10,10);
         free(p);
         free(q);
-      ])
+      ]])
     ],[
       curl_cv_need_header_malloc_h="no"
     ],[
@@ -255,7 +255,7 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
         for arg2 in "struct sockaddr" void; do
           for t in int size_t unsigned long "unsigned long"; do
             AC_COMPILE_IFELSE([
-              AC_LANG_PROGRAM([
+              AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -280,10 +280,10 @@ AC_DEFUN([CURL_CHECK_TYPE_SOCKLEN_T], [
 #define GETPEERNCALLCONV
 #endif
                 extern int GETPEERNCALLCONV getpeername ($arg1, $arg2 *, $t *);
-              ],[
+              ]],[[
                 $t len=0;
                 getpeername(0,0,&len);
-              ])
+              ]])
             ],[
                curl_cv_socklen_t_equiv="$t"
                break 3
@@ -358,10 +358,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
   if test "$curl_cv_getnameinfo" != "yes"; then
     AC_MSG_CHECKING([deeper for getnameinfo])
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([
-      ],[
+      AC_LANG_PROGRAM([[
+      ]],[[
         getnameinfo();
-      ])
+      ]])
     ],[
       AC_MSG_RESULT([yes])
       curl_cv_getnameinfo="yes"
@@ -374,7 +374,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
   if test "$curl_cv_getnameinfo" != "yes"; then
     AC_MSG_CHECKING([deeper and deeper for getnameinfo])
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -398,9 +398,9 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
 #include <netdb.h>
 #endif
 #endif
-      ],[
+      ]],[[
         getnameinfo(0, 0, 0, 0, 0, 0, 0);
-      ])
+      ]])
     ],[
       AC_MSG_RESULT([yes])
       curl_cv_getnameinfo="yes"
@@ -419,7 +419,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
           for gni_arg46 in 'size_t' 'int' 'socklen_t' 'unsigned int' 'DWORD'; do
             for gni_arg7 in 'int' 'unsigned int'; do
               AC_COMPILE_IFELSE([
-                AC_LANG_PROGRAM([
+                AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -453,13 +453,13 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
                                          char *, $gni_arg46,
                                          char *, $gni_arg46,
                                          $gni_arg7);
-                ],[
+                ]],[[
                   $gni_arg2 salen=0;
                   $gni_arg46 hostlen=0;
                   $gni_arg46 servlen=0;
                   $gni_arg7 flags=0;
                   int res = getnameinfo(0, salen, 0, hostlen, 0, servlen, flags);
-                ])
+                ]])
               ],[
                  curl_cv_func_getnameinfo_args="$gni_arg1,$gni_arg2,$gni_arg46,$gni_arg7"
                  break 4
@@ -580,7 +580,7 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
   AC_CACHE_CHECK([for working NI_WITHSCOPEID], 
     [ac_cv_working_ni_withscopeid], [
     AC_RUN_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
@@ -599,7 +599,7 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-      ],[
+      ]],[[
 #if defined(NI_WITHSCOPEID) && defined(HAVE_GETNAMEINFO)
 #ifdef HAVE_STRUCT_SOCKADDR_STORAGE
         struct sockaddr_storage sa;
@@ -630,7 +630,7 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
 #else
         return 4; /* Error, NI_WITHSCOPEID not defined or no getnameinfo() */
 #endif
-      ]) # AC_LANG_PROGRAM
+      ]]) # AC_LANG_PROGRAM
     ],[
       # Exit code == 0. Program worked.
       ac_cv_working_ni_withscopeid="yes"
@@ -641,13 +641,13 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
       # Program is not run when cross-compiling. So we assume
       # NI_WITHSCOPEID will work if we are able to compile it.
       AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([
+        AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
-        ],[
+        ]],[[
           unsigned int dummy= NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
-        ])
+        ]])
       ],[
         ac_cv_working_ni_withscopeid="yes"
       ],[
@@ -681,7 +681,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
   #
   AC_MSG_CHECKING([for recv])
   AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([
+    AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -703,9 +703,9 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
 #include <sys/socket.h>
 #endif
 #endif
-    ],[
+    ]],[[
       recv(0, 0, 0, 0);
-    ])
+    ]])
   ],[
     AC_MSG_RESULT([yes])
     curl_cv_recv="yes"
@@ -724,7 +724,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
             for recv_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do
               for recv_arg4 in 'int' 'unsigned int'; do
                 AC_COMPILE_IFELSE([
-                  AC_LANG_PROGRAM([
+                  AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -749,13 +749,13 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [
 #define RECVCALLCONV
 #endif
                     extern $recv_retv RECVCALLCONV recv($recv_arg1, $recv_arg2, $recv_arg3, $recv_arg4);
-                  ],[
+                  ]],[[
                     $recv_arg1 s=0;
                     $recv_arg2 buf=0;
                     $recv_arg3 len=0;
                     $recv_arg4 flags=0;
                     $recv_retv res = recv(s, buf, len, flags);
-                  ])
+                  ]])
                 ],[
                    curl_cv_func_recv_args="$recv_arg1,$recv_arg2,$recv_arg3,$recv_arg4,$recv_retv"
                    break 5
@@ -813,7 +813,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
   #
   AC_MSG_CHECKING([for send])
   AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([
+    AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -835,9 +835,9 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
 #include <sys/socket.h>
 #endif
 #endif
-    ],[
+    ]],[[
       send(0, 0, 0, 0);
-    ])
+    ]])
   ],[
     AC_MSG_RESULT([yes])
     curl_cv_send="yes"
@@ -856,7 +856,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
             for send_arg3 in 'size_t' 'int' 'socklen_t' 'unsigned int'; do
               for send_arg4 in 'int' 'unsigned int'; do
                 AC_COMPILE_IFELSE([
-                  AC_LANG_PROGRAM([
+                  AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -881,12 +881,12 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [
 #define SENDCALLCONV
 #endif
                     extern $send_retv SENDCALLCONV send($send_arg1, $send_arg2, $send_arg3, $send_arg4);
-                  ],[
+                  ]],[[
                     $send_arg1 s=0;
                     $send_arg3 len=0;
                     $send_arg4 flags=0;
                     $send_retv res = send(s, 0, len, flags);
-                  ])
+                  ]])
                 ],[
                    curl_cv_func_send_args="$send_arg1,$send_arg2,$send_arg3,$send_arg4,$send_retv"
                    break 5
@@ -968,7 +968,7 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
   AC_CHECK_HEADERS(sys/types.h sys/socket.h)
   AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -990,9 +990,9 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
 #include <sys/socket.h>
 #endif
 #endif
-      ],[
+      ]],[[
         int flag=MSG_NOSIGNAL;
-      ])
+      ]])
     ],[
       ac_cv_msg_nosignal="yes"
     ],[
@@ -1019,7 +1019,7 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
   AC_CHECK_HEADERS(sys/types.h sys/time.h time.h)
   AC_CACHE_CHECK([for struct timeval], [ac_cv_struct_timeval], [
     AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #undef inline 
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1047,11 +1047,11 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [
 #include <time.h>
 #endif
 #endif
-      ],[
+      ]],[[
         struct timeval ts;
         ts.tv_sec  = 0;
         ts.tv_usec = 0;
-      ])
+      ]])
     ],[
       ac_cv_struct_timeval="yes"
     ],[
@@ -1087,13 +1087,13 @@ AC_DEFUN([TYPE_SIG_ATOMIC_T], [
       #
       AC_MSG_CHECKING([if sig_atomic_t is already defined as volatile])
       AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
+        AC_LANG_PROGRAM([[
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-        ],[
+        ]],[[
           static volatile sig_atomic_t dummy = 0;
-        ])
+        ]])
       ],[
         AC_MSG_RESULT([no])
         ac_cv_sig_atomic_t_volatile="no"
@@ -1266,7 +1266,7 @@ AC_DEFUN([TYPE_IN_ADDR_T],
          curl_cv_in_addr_t_equiv=
          for t in "unsigned long" int size_t unsigned long; do
             AC_LINK_IFELSE([
-              AC_LANG_PROGRAM([
+              AC_LANG_PROGRAM([[
 #undef inline
 #ifdef HAVE_WINDOWS_H
 #ifndef WIN32_LEAN_AND_MEAN
@@ -1294,9 +1294,9 @@ AC_DEFUN([TYPE_IN_ADDR_T],
 #include <arpa/inet.h>
 #endif
 #endif
-              ],[
+              ]],[[
                 $t data = inet_addr ("1.2.3.4");
-              ])
+              ]])
             ],[
               curl_cv_in_addr_t_equiv="$t"
               break
@@ -1350,7 +1350,7 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC], [
   AC_CHECK_HEADERS(sys/types.h sys/time.h time.h)
   AC_MSG_CHECKING([for monotonic clock_gettime])
   AC_COMPILE_IFELSE([
-    AC_LANG_PROGRAM([
+    AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -1364,10 +1364,10 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC], [
 #include <time.h>
 #endif
 #endif
-    ],[
+    ]],[[
       struct timespec ts;
       (void)clock_gettime(CLOCK_MONOTONIC, &ts);
-    ])
+    ]])
   ],[
     AC_MSG_RESULT([yes])
     ac_cv_func_clock_gettime="yes"
@@ -1401,7 +1401,7 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
         LIBS="$x_xlibs $curl_cv_save_LIBS"
       fi
       AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
+        AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -1415,10 +1415,10 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
 #include <time.h>
 #endif
 #endif
-        ],[
+        ]],[[
           struct timespec ts;
           (void)clock_gettime(CLOCK_MONOTONIC, &ts);
-        ])
+        ]])
       ],[
         curl_cv_gclk_LIBS="$x_xlibs"
         break
@@ -1669,28 +1669,28 @@ AC_DEFUN([CARES_CHECK_GETSERVBYPORT_R], [
   ac_func_getservbyport_r="unknown"
 
   AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([
+    AC_LANG_PROGRAM([[
 #include <netdb.h>
-    ],[
+    ]],[[
       int p1, p5;
       char *p2, p4[4096];
       struct servent *p3, *p6;
       getservbyport_r(p1, p2, p3, p4, p5, &p6);
-    ])
+    ]])
   ],[
     ac_func_getservbyport_r="6"
   ])
 
   if test "$ac_func_getservbyport_r" = "unknown"; then
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #include <netdb.h>
-      ],[
+      ]],[[
         int p1, p5;
         char *p2, p4[4096];
         struct servent *p3;
         getservbyport_r(p1, p2, p3, p4, p5);
-      ])
+      ]])
     ],[
       ac_func_getservbyport_r="5"
     ])
@@ -1698,15 +1698,15 @@ AC_DEFUN([CARES_CHECK_GETSERVBYPORT_R], [
 
   if test "$ac_func_getservbyport_r" = "unknown"; then
     AC_LINK_IFELSE([
-      AC_LANG_PROGRAM([
+      AC_LANG_PROGRAM([[
 #include <netdb.h>
-      ],[
+      ]],[[
         int p1;
         char *p2;
         struct servent *p3;
         struct servent_data p4;
         getservbyport_r(p1, p2, p3, &p4);
-      ])
+      ]])
     ],[
       ac_func_getservbyport_r="4"
     ])
diff --git a/configure.ac b/configure.ac
index b5060a013..0dcd3648b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2251,7 +2251,7 @@ AC_HELP_STRING([--disable-ares],[Disable c-ares for name lookups]),
          dnl check it because it might not have been built yet)
          AC_MSG_CHECKING([that c-ares is good and recent enough])
          AC_LINK_IFELSE([
-           AC_LANG_PROGRAM([
+           AC_LANG_PROGRAM([[
 #include <ares.h>
              /* set of dummy functions in case c-ares was built with debug */
              void curl_dofree() { }
@@ -2259,11 +2259,11 @@ AC_HELP_STRING([--disable-ares],[Disable c-ares for name lookups]),
              void curl_domalloc() { }
              void curl_docalloc() { }
              void curl_socket() { }
-           ],[
+           ]],[[
              ares_channel channel;
              ares_cancel(channel); /* added in 1.2.0 */
              ares_process_fd(channel, 0, 0); /* added in 1.4.0 */
-           ])
+           ]])
          ],[
            AC_MSG_RESULT([yes])
          ],[