diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2012-01-14 16:43:12 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2012-01-14 16:43:12 +0000 |
| commit | 35a5b042d796ef7ca871df63bb2401a45b2f36f0 (patch) | |
| tree | d17326d041510e99d2b522dd33f9c468e7da06fa /autoconf | |
| parent | 0f83634984989c77f45e05adc2ba5440fb0c3beb (diff) | |
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.
........
Merged revisions 350837 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 350838 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350839 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'autoconf')
| -rw-r--r-- | autoconf/ast_gcc_attribute.m4 | 8 | ||||
| -rw-r--r-- | autoconf/libcurl.m4 | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/autoconf/ast_gcc_attribute.m4 b/autoconf/ast_gcc_attribute.m4 index 9d70b5a49..bceaa28a3 100644 --- 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 09996c730..085ee0ea0 100644 --- 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 |