Ensure that all AC_LANG_PROGRAM calls in the configure script are properly quoted.

Recent versions of autoconf (2.68 on my system) won't properly process the configure
script unless every call to AC_LANG_PROGRAM is m4-quoted. Many calls in the script
were, but many were not. This patch corrects the unquoted calls.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@350837 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/autoconf/ast_gcc_attribute.m4 b/autoconf/ast_gcc_attribute.m4
index 9d70b5a497653923d3478bc8fb64170a18caac89..bceaa28a312d61897199b5844e69f49b3f999fe0 100644 (file)
--- a/autoconf/ast_gcc_attribute.m4
+++ b/autoconf/ast_gcc_attribute.m4
@@ -11,8 +11,8 @@ m4_ifval([$4],$4=0)
 if test "x$2" = "x"
 then
 AC_COMPILE_IFELSE(
-       AC_LANG_PROGRAM([$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}],
-                       []),
+       [AC_LANG_PROGRAM([$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}],
+                       [])],
        AC_MSG_RESULT(yes)
        m4_ifval([$4],$4=1)
        AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
@@ -20,8 +20,8 @@ AC_COMPILE_IFELSE(
 )
 else
 AC_COMPILE_IFELSE(
-       AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}],
-                       []),
+       [AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}],
+                       [])],
        AC_MSG_RESULT(yes)
        m4_ifval([$4],$4=1)
        AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),

diff --git a/autoconf/libcurl.m4 b/autoconf/libcurl.m4
index 09996c7301b25fedfa0869d965ea66ecbcbdc67d..085ee0ea0891b67320a3e14c3b4c2bf6a09dc57b 100644 (file)
--- a/autoconf/libcurl.m4
+++ b/autoconf/libcurl.m4
@@ -143,7 +143,7 @@ AC_DEFUN([AST_LIBCURL_CHECK_CONFIG],
            _libcurl_save_libs=$LIBS
            LIBS="$CURL_LIB $LIBS"
 
-           AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
+           AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curl/curl.h>],[
 /* Try and use a few common options to force a failure if we are
    missing symbols or can't link. */
 int x;
@@ -154,7 +154,7 @@ x=CURLOPT_FILE;
 x=CURLOPT_ERRORBUFFER;
 x=CURLOPT_STDERR;
 x=CURLOPT_VERBOSE;
-]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
+])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
 
            CPPFLAGS=$_libcurl_save_cppflags
            LIBS=$_libcurl_save_libs

diff --git a/configure b/configure
index 0cb05ae93e1cc49353cd2b246c4fc973c2d0a7a7..947c041f8b59fbd47a651602c8052b2a9eaa183d 100755 (executable)
--- a/configure
+++ b/configure
@@ -15662,7 +15662,7 @@ main ()
        struct rlimit rlim = { FD_SETSIZE * 2, FD_SETSIZE * 2 };
        int fd0, fd1;
        struct timeval tv = { 0, };
-       struct ast_fdset { long fds_bits[1024]; } fds = { { 0, } };
+       struct ast_fdset { long fds_bits[[1024]]; } fds = { { 0, } };
        if (setrlimit(RLIMIT_NOFILE, &rlim)) { exit(1); }
        if ((fd0 = open("/dev/null", O_RDONLY)) < 0) { exit(1); }
        if (dup2(fd0, (fd1 = FD_SETSIZE + 1)) < 0) { exit(1); }

diff --git a/configure.ac b/configure.ac
index 3a718f5922960621381596acf8ca3ef6c6c3a892..4234b3ae0c96d9824deb46a62a2133bfd640d0bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -578,8 +578,8 @@ fi
 
 AC_MSG_CHECKING(for LLONG_MAX in limits.h)
 AC_LINK_IFELSE(
-       AC_LANG_PROGRAM([#include <limits.h>],
-               [long long foo = LLONG_MAX]),
+       [AC_LANG_PROGRAM([#include <limits.h>],
+               [long long foo = LLONG_MAX])],
        AC_MSG_RESULT(yes)
        AC_DEFINE([HAVE_LLONG_MAX], 1, [Define to 1 if limits.h includes a LLONG_MAX definition.]),
        AC_MSG_RESULT(no)
@@ -587,8 +587,8 @@ AC_LINK_IFELSE(
 
 AC_MSG_CHECKING(for timersub in time.h)
 AC_LINK_IFELSE(
-       AC_LANG_PROGRAM([#include <sys/time.h>],
-               [struct timeval *a; timersub(a, a, a);]),
+       [AC_LANG_PROGRAM([#include <sys/time.h>],
+               [struct timeval *a; timersub(a, a, a);])],
        AC_MSG_RESULT(yes)
                AC_DEFINE([HAVE_TIMERSUB], 1, [Define to 1 if your system defines timersub.]),
        AC_MSG_RESULT(no)
@@ -604,7 +604,7 @@ _ACEOF
 LDFLAGS="${LDFLAGS} -Wl,--dynamic-list,conftest.dynamics"
 PBX_DYNAMIC_LIST=0
 AC_LINK_IFELSE(
-       AC_LANG_PROGRAM([], []),
+       [AC_LANG_PROGRAM([], [])],
        PBX_DYNAMIC_LIST=1
        AC_MSG_RESULT(yes),
        AC_MSG_RESULT(no)
@@ -639,8 +639,8 @@ AC_CHECK_FUNCS([inet_aton])
 # check if we have IP_PKTINFO constant defined
 AC_MSG_CHECKING(for IP_PKTINFO)
 AC_LINK_IFELSE(
-               AC_LANG_PROGRAM([#include <netinet/in.h>],
-                                               [int pi = IP_PKTINFO;]),
+               [AC_LANG_PROGRAM([#include <netinet/in.h>],
+                                               [int pi = IP_PKTINFO;])],
                AC_MSG_RESULT(yes)
                AC_DEFINE([HAVE_PKTINFO], 1, [Define to 1 if your system defines IP_PKTINFO.]),
                AC_MSG_RESULT(no)
@@ -651,9 +651,9 @@ AC_SEARCH_LIBS(gethostbyname_r, [socket nsl])
 
 AC_MSG_CHECKING(for gethostbyname_r with 6 arguments)
 AC_LINK_IFELSE(
-        AC_LANG_PROGRAM([#include <stdlib.h>
+        [AC_LANG_PROGRAM([#include <stdlib.h>
                          #include <netdb.h>],
-                        [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);]),
+                        [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);])],
         AC_MSG_RESULT(yes)
         AC_DEFINE([HAVE_GETHOSTBYNAME_R_6], 1, [Define to 1 if your system has gethostbyname_r with 6 arguments.]),
         AC_MSG_RESULT(no)
@@ -661,9 +661,9 @@ AC_LINK_IFELSE(
 
 AC_MSG_CHECKING(for gethostbyname_r with 5 arguments)
 AC_LINK_IFELSE(
-        AC_LANG_PROGRAM([#include <stdlib.h>
+        [AC_LANG_PROGRAM([#include <stdlib.h>
                         #include <netdb.h>],
-                        [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);]),
+                        [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);])],
         AC_MSG_RESULT(yes)
         AC_DEFINE([HAVE_GETHOSTBYNAME_R_5], 1, [Define to 1 if your system has gethostbyname_r with 5 arguments.]),
         AC_MSG_RESULT(no)
@@ -673,7 +673,7 @@ AC_CHECK_HEADER([byteswap.h], [AC_DEFINE_UNQUOTED([HAVE_BYTESWAP_H], 1, [Define
 
 AC_MSG_CHECKING(for __swap16 variant of <sys/endian.h> byteswapping macros)
 AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <sys/endian.h>], [int a = 1; int b = __swap16(a);]),
+[AC_LANG_PROGRAM([#include <sys/endian.h>], [int a = 1; int b = __swap16(a);])],
 AC_MSG_RESULT(yes)
 AC_DEFINE([HAVE_SYS_ENDIAN_SWAP16], 1, [Define to 1 if your sys/endian.h header file provides the __swap16 macro.]),
 AC_MSG_RESULT(no)
@@ -681,7 +681,7 @@ AC_MSG_RESULT(no)
 
 AC_MSG_CHECKING(for bswap16 variant of <sys/endian.h> byteswapping macros)
 AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <sys/endian.h>], [int a = 1; int b = bswap16(a);]),
+[AC_LANG_PROGRAM([#include <sys/endian.h>], [int a = 1; int b = bswap16(a);])],
 AC_MSG_RESULT(yes)
 AC_DEFINE([HAVE_SYS_ENDIAN_BSWAP16], 1, [Define to 1 if your sys/endian.h header file provides the bswap16 macro.]),
 AC_MSG_RESULT(no)
@@ -694,13 +694,13 @@ fi
 
 AC_MSG_CHECKING(for locale_t in locale.h)
 AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <locale.h>], [locale_t lt = NULL]),
+[AC_LANG_PROGRAM([#include <locale.h>], [locale_t lt = NULL])],
 AC_MSG_RESULT(yes)
 AC_DEFINE([HAVE_LOCALE_T_IN_LOCALE_H], 1, [Define to 1 if your system defines the locale_t type in locale.h]),
 AC_MSG_RESULT(no)
   AC_MSG_CHECKING(for locale_t in xlocale.h)
   AC_LINK_IFELSE(
-  AC_LANG_PROGRAM([#include <xlocale.h>], [locale_t lt = NULL]),
+  [AC_LANG_PROGRAM([#include <xlocale.h>], [locale_t lt = NULL])],
   AC_MSG_RESULT(yes)
   AC_DEFINE([HAVE_LOCALE_T_IN_XLOCALE_H], 1, [Define to 1 if your system defines the locale_t type in xlocale.h]),
   AC_MSG_RESULT(no)
@@ -709,7 +709,7 @@ AC_MSG_RESULT(no)
 
 AC_MSG_CHECKING(for O_EVTONLY in fcntl.h)
 AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <fcntl.h>], [int a = O_EVTONLY;]),
+[AC_LANG_PROGRAM([#include <fcntl.h>], [int a = O_EVTONLY;])],
 AC_MSG_RESULT(yes)
 AC_DEFINE([HAVE_O_EVTONLY], 1, [Define to 1 if your system defines the file flag O_EVTONLY in fcntl.h]),
 AC_MSG_RESULT(no)
@@ -717,7 +717,7 @@ AC_MSG_RESULT(no)
 
 AC_MSG_CHECKING(for O_SYMLINK in fcntl.h)
 AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <fcntl.h>], [int a = O_SYMLINK;]),
+[AC_LANG_PROGRAM([#include <fcntl.h>], [int a = O_SYMLINK;])],
 AC_MSG_RESULT(yes)
 AC_DEFINE([HAVE_O_SYMLINK], 1, [Define to 1 if your system defines the file flag O_SYMLINK in fcntl.h]),
 AC_MSG_RESULT(no)
@@ -727,7 +727,7 @@ AST_C_DEFINE_CHECK([PTHREAD_RWLOCK_INITIALIZER], [PTHREAD_RWLOCK_INITIALIZER], [
 
 AC_MSG_CHECKING(for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h)
 AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_RWLOCK_PREFER_WRITER_NP;]),
+[AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_RWLOCK_PREFER_WRITER_NP;])],
 AC_MSG_RESULT(yes)
 AC_DEFINE([HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP], 1, [Define to 1 if your system defines PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h]),
 AC_MSG_RESULT(no)
@@ -735,7 +735,7 @@ AC_MSG_RESULT(no)
 
 AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h)
 AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_MUTEX_RECURSIVE_NP;]),
+[AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_MUTEX_RECURSIVE_NP;])],
 AC_MSG_RESULT(yes)
 AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE_NP], 1, [Define to 1 if your system defines PTHREAD_MUTEX_RECURSIVE_NP in pthread.h]),
 AC_MSG_RESULT(no)
@@ -792,11 +792,11 @@ AST_C_DEFINE_CHECK([PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP], [PTHREAD_RECURSIVE_
 # Generally yes on OpenBSD/FreeBSD and no on Mac OS X.
 AC_MSG_CHECKING(whether we can compare a mutex to its initial value)
 AC_LINK_IFELSE(
-       AC_LANG_PROGRAM([#include <pthread.h>], [pthread_mutex_t lock;
+       [AC_LANG_PROGRAM([#include <pthread.h>], [pthread_mutex_t lock;
        if ((lock) != ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
                return 0;
        }
-       return 0]),
+       return 0])],
        AC_MSG_RESULT(yes)
        AC_DEFINE([CAN_COMPARE_MUTEX_TO_INIT_VALUE], 1, [Define to 1 if your system's implementation of mutexes supports comparison of a mutex to its initializer.]),
        AC_MSG_RESULT(no)
@@ -819,7 +819,7 @@ AC_LINK_IFELSE(
 
 AC_MSG_CHECKING(for compiler atomic operations)
 AC_LINK_IFELSE(
-AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);]),
+[AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);])],
 AC_MSG_RESULT(yes)
 AC_DEFINE([HAVE_GCC_ATOMICS], 1, [Define to 1 if your GCC C compiler provides atomic operations.]),
 AC_MSG_RESULT(no)
@@ -828,8 +828,8 @@ AC_MSG_RESULT(no)
 # glibc, AFAIK, is the only C library that makes printing a NULL to a string safe.
 AC_MSG_CHECKING([if your system printf is NULL-safe.])
 AC_RUN_IFELSE(
-       AC_LANG_PROGRAM([#include <stdio.h>],
-               [printf("%s", NULL)]),
+       [AC_LANG_PROGRAM([#include <stdio.h>],
+               [printf("%s", NULL)])],
        AC_DEFINE([HAVE_NULLSAFE_PRINTF], 1, [Define to 1 if your C library can safely print NULL to string formats.])
        AC_MSG_RESULT(yes),
        AC_MSG_RESULT(no),
@@ -839,7 +839,7 @@ AC_RUN_IFELSE(
 
 AC_MSG_CHECKING(if we can increase the maximum select-able file descriptor)
 AC_RUN_IFELSE(
-AC_LANG_PROGRAM([
+[AC_LANG_PROGRAM([
 #include <stdio.h>
 #include <sys/select.h>
 #include <sys/time.h>
@@ -862,7 +862,7 @@ AC_LANG_PROGRAM([
        FD_SET(fd0, (fd_set *) &fds);
        FD_SET(fd1, (fd_set *) &fds);
        if (select(FD_SETSIZE + 2, (fd_set *) &fds, NULL, NULL, &tv) < 0) { exit(1); }
-       exit(0)]]),
+       exit(0)]])],
        AC_MSG_RESULT(yes)
        AC_DEFINE([HAVE_VARIABLE_FDSET], 1, [Define to 1 if your system can support larger than default select bitmasks.]),
        AC_MSG_RESULT(no),
@@ -871,11 +871,11 @@ AC_LANG_PROGRAM([
 
 if test "${ac_cv_have_variable_fdset}x" = "0x"; then
        AC_RUN_IFELSE(
-               AC_LANG_PROGRAM([
+               [AC_LANG_PROGRAM([
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdlib.h>
-], [if (getuid() != 0) { exit(1); }]),
+], [if (getuid() != 0) { exit(1); }])],
                AC_DEFINE([CONFIGURE_RAN_AS_ROOT], 1, [Some configure tests will unexpectedly fail if configure is run by a non-root user.  These may be able to be tested at runtime.]))
 fi
 
@@ -923,13 +923,13 @@ AC_MSG_CHECKING(for -ffunction-sections support)
 saved_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} -ffunction-sections"
 AC_COMPILE_IFELSE(
-       AC_LANG_PROGRAM([], [int x = 1;]),
+       [AC_LANG_PROGRAM([], [int x = 1;])],
        AC_MSG_RESULT(yes)
        [saved_LDFLAGS="${LDFLAGS}"]
        [LDFLAGS="${LDFLAGS} -Wl,--gc-sections"]
        AC_MSG_CHECKING(for --gc-sections support)
        AC_LINK_IFELSE(
-               AC_LANG_PROGRAM([], [int x = 1;]),
+               [AC_LANG_PROGRAM([], [int x = 1;])],
                AC_MSG_RESULT(yes)
                [GC_CFLAGS="-ffunction-sections"]
                [[GC_LDFLAGS="-Wl,--gc-sections"]],
@@ -984,8 +984,8 @@ AC_SUBST(AST_SHADOW_WARNINGS)
 
 AC_MSG_CHECKING(for sysinfo)
 AC_LINK_IFELSE(
-        AC_LANG_PROGRAM([#include <sys/sysinfo.h>],
-                        [struct sysinfo sys_info; int uptime = sys_info.uptime]),
+        [AC_LANG_PROGRAM([#include <sys/sysinfo.h>],
+                        [struct sysinfo sys_info; int uptime = sys_info.uptime])],
         AC_MSG_RESULT(yes)
         AC_DEFINE([HAVE_SYSINFO], 1, [Define to 1 if your system has sysinfo support]),
         AC_MSG_RESULT(no)
@@ -994,7 +994,7 @@ AC_LINK_IFELSE(
 AC_SEARCH_LIBS(res_9_ninit, resolv)
 AC_MSG_CHECKING(for res_ninit)
 AC_LINK_IFELSE(
-       AC_LANG_PROGRAM([
+       [AC_LANG_PROGRAM([
                        #ifdef HAVE_SYS_SOCKET_H
                        #include <sys/socket.h>
                        #endif
@@ -1005,13 +1005,13 @@ AC_LINK_IFELSE(
                        #include <arpa/nameser.h>
                        #endif
                        #include <resolv.h>],
-                       [int foo = res_ninit(NULL);]),
+                       [int foo = res_ninit(NULL);])],
        AC_MSG_RESULT(yes)
        AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.])
        AC_SEARCH_LIBS(res_9_ndestroy, resolv)
        AC_MSG_CHECKING(for res_ndestroy)
        AC_LINK_IFELSE(
-               AC_LANG_PROGRAM([
+               [AC_LANG_PROGRAM([
                                #ifdef HAVE_SYS_SOCKET_H
                                #include <sys/socket.h>
                                #endif
@@ -1022,7 +1022,7 @@ AC_LINK_IFELSE(
                                #include <arpa/nameser.h>
                                #endif
                                #include <resolv.h>],
-                               [res_ndestroy(NULL);]),
+                               [res_ndestroy(NULL);])],
                AC_MSG_RESULT(yes)
                AC_DEFINE([HAVE_RES_NDESTROY], 1, [Define to 1 if your system has the ndestroy resolver function.]),
                AC_MSG_RESULT(no)
@@ -1030,7 +1030,7 @@ AC_LINK_IFELSE(
        AC_SEARCH_LIBS(res_9_close, resolv)
        AC_MSG_CHECKING(for res_close)
        AC_LINK_IFELSE(
-               AC_LANG_PROGRAM([
+               [AC_LANG_PROGRAM([
                                #ifdef HAVE_SYS_SOCKET_H
                                #include <sys/socket.h>
                                #endif
@@ -1041,7 +1041,7 @@ AC_LINK_IFELSE(
                                #include <arpa/nameser.h>
                                #endif
                                #include <resolv.h>],
-                               [res_close();]),
+                               [res_close();])],
                AC_MSG_RESULT(yes)
                AC_DEFINE([HAVE_RES_CLOSE], 1, [Define to 1 if your system has the close resolver function.]),
                AC_MSG_RESULT(no)
@@ -1086,10 +1086,10 @@ PBX_DLADDR=0
 old_LIBS=${LIBS}
 LIBS="${LIBS} -ldl"
 AC_LINK_IFELSE(
-       AC_LANG_PROGRAM([#define _GNU_SOURCE 1
+       [AC_LANG_PROGRAM([#define _GNU_SOURCE 1
 #include <dlfcn.h>],
                [dladdr((void *)0, (void *)0)]
-       ),
+       )],
        AC_MSG_RESULT(yes)
        PBX_DLADDR=1
        AC_SUBST([PBX_DLADDR])
@@ -1220,7 +1220,7 @@ if test "${USE_IMAP_TK}" != "no"; then
        CPPFLAGS="${CPPFLAGS} ${imap_include}"
                LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
                AC_LINK_IFELSE(
-               AC_LANG_PROGRAM(
+               [AC_LANG_PROGRAM(
                                [#include "c-client.h"
                                void mm_searched (MAILSTREAM *stream,unsigned long number)
                                {
@@ -1270,13 +1270,13 @@ if test "${USE_IMAP_TK}" != "no"; then
                                [
                                MAILSTREAM *foo = mail_open(NULL, "", 0);
                                ]
-                       ),
+                       )],
                        [ac_cv_imap_tk="yes"],
                        [ac_cv_imap_tk="no"]
                )
                if test "${ac_cv_imap_tk}" = "yes"; then
                        AC_LINK_IFELSE(
-                               AC_LANG_PROGRAM(
+                               [AC_LANG_PROGRAM(
                                        [#include "c-client.h"
                                        void mm_searched (MAILSTREAM *stream,unsigned long number)
                                        {
@@ -1326,7 +1326,7 @@ if test "${USE_IMAP_TK}" != "no"; then
                                        [
                                        long check = mail_expunge_full(NULL, "", 0);
                                        ]
-                               ),
+                               )],
                                [ac_cv_imap_tk2006="yes"],
                                [ac_cv_imap_tk2006="no"]
                        )
@@ -1347,7 +1347,7 @@ if test "${USE_IMAP_TK}" != "no"; then
                                CPPFLAGS="${CPPFLAGS} ${imap_include}"
                                LIBS="${LIBS} ${imap_libs} ${imap_ldflags}"
                                AC_LINK_IFELSE(
-                               AC_LANG_PROGRAM(
+                               [AC_LANG_PROGRAM(
                                                [#include "c-client.h"
                                                void mm_searched (MAILSTREAM *stream,unsigned long number)
                                                {
@@ -1397,13 +1397,13 @@ if test "${USE_IMAP_TK}" != "no"; then
                                                [
                                                MAILSTREAM *foo = mail_open(NULL, "", 0);
                                                ]
-                                       ),
+                                       )],
                                        [ac_cv_imap_tk="yes"],
                                        [ac_cv_imap_tk="no"]
                                )
                                if test "${ac_cv_imap_tk}" = "yes"; then
                                        AC_LINK_IFELSE(
-                                               AC_LANG_PROGRAM(
+                                               [AC_LANG_PROGRAM(
                                                        [#include "c-client.h"
                                                        void mm_searched (MAILSTREAM *stream,unsigned long number)
                                                        {
@@ -1453,7 +1453,7 @@ if test "${USE_IMAP_TK}" != "no"; then
                                                        [
                                                        long check = mail_expunge_full(NULL, "", 0);
                                                        ]
-                                               ),
+                                               )],
                                                [ac_cv_imap_tk2006="yes"],
                                                [ac_cv_imap_tk2006="no"]
                                        )
@@ -1472,7 +1472,7 @@ if test "${USE_IMAP_TK}" != "no"; then
                CPPFLAGS="${CPPFLAGS} ${imap_include}"
                LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
                AC_LINK_IFELSE(
-               AC_LANG_PROGRAM(
+               [AC_LANG_PROGRAM(
                                [#include <stdio.h>
                                #include <imap/c-client.h>
                                void mm_searched (MAILSTREAM *stream,unsigned long number)
@@ -1523,13 +1523,13 @@ if test "${USE_IMAP_TK}" != "no"; then
                                [
                                MAILSTREAM *foo = mail_open(NULL, "", 0);
                                ]
-                       ),
+                       )],
                        [ac_cv_imap_tk="yes"],
                        [ac_cv_imap_tk="no"]
                )
                if test "${ac_cv_imap_tk}" = "yes"; then
                        AC_LINK_IFELSE(
-                               AC_LANG_PROGRAM(
+                               [AC_LANG_PROGRAM(
                                        [#include <stdio.h>
                                        #include <imap/c-client.h>
                                        void mm_searched (MAILSTREAM *stream,unsigned long number)
@@ -1580,7 +1580,7 @@ if test "${USE_IMAP_TK}" != "no"; then
                                        [
                                        long check = mail_expunge_full(NULL, "", 0);
                                        ]
-                               ),
+                               )],
                                [ac_cv_imap_tk2006="yes"],
                                [ac_cv_imap_tk2006="no"]
                        )
@@ -1593,7 +1593,7 @@ if test "${USE_IMAP_TK}" != "no"; then
                        CPPFLAGS="${CPPFLAGS} ${imap_include}"
                        LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
                        AC_LINK_IFELSE(
-                       AC_LANG_PROGRAM(
+                       [AC_LANG_PROGRAM(
                                        [#include <stdio.h>
                                        #include <c-client/c-client.h>
                                        void mm_searched (MAILSTREAM *stream,unsigned long number)
@@ -1644,13 +1644,13 @@ if test "${USE_IMAP_TK}" != "no"; then
                                        [
                                        MAILSTREAM *foo = mail_open(NULL, "", 0);
                                        ]
-                               ),
+                               )],
                                [ac_cv_imap_tk="yes"],
                                [ac_cv_imap_tk="no"]
                        )
                        if test "${ac_cv_imap_tk}" = "yes"; then
                                AC_LINK_IFELSE(
-                                       AC_LANG_PROGRAM(
+                                       [AC_LANG_PROGRAM(
                                                [#include <stdio.h>
                                                #include <c-client/c-client.h>
                                                void mm_searched (MAILSTREAM *stream,unsigned long number)
@@ -1701,7 +1701,7 @@ if test "${USE_IMAP_TK}" != "no"; then
                                                [
                                                long check = mail_expunge_full(NULL, "", 0);
                                                ]
-                                       ),
+                                       )],
                                        [ac_cv_imap_tk2006="yes"],
                                        [ac_cv_imap_tk2006="no"]
                                )
@@ -2133,10 +2133,10 @@ if test "x${PBX_UNIXODBC}" = "x1" -o "x${PBX_IODBC}" = "x1"; then
        # Does ODBC support wide characters?
        AC_MSG_CHECKING(whether ODBC has support for Unicode types)
        AC_LINK_IFELSE(
-               AC_LANG_PROGRAM(
+               [AC_LANG_PROGRAM(
                        [#include <sql.h>
 #include <sqlext.h>],
-                       [int foo = SQL_WCHAR]),
+                       [int foo = SQL_WCHAR])],
                AC_MSG_RESULT(yes)
                        AC_DEFINE([HAVE_ODBC_WCHAR], [1], [Define to 1 if your ODBC library has wide (Unicode) types.]),
                AC_MSG_RESULT(no)