diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/libcurl.m4 | 12 | ||||
| -rw-r--r-- | m4/libusb.m4 | 4 | ||||
| -rw-r--r-- | m4/readline.m4 | 6 |
4 files changed, 15 insertions, 11 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 5cbbb6321..80447d475 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2011-08-09 Werner Koch <[email protected]> + + * libcurl.m4: s/ifelse/m4_if/. + 2009-07-21 Werner Koch <[email protected]> * estream.m4: New. Taken from libestream. diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 index b43cd9005..c763146a3 100644 --- a/m4/libcurl.m4 +++ b/m4/libcurl.m4 @@ -58,7 +58,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], AC_ARG_WITH(libcurl, AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]), - [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) + [_libcurl_with=$withval],[_libcurl_with=m4_if([$1],,[yes],[$1])]) if test "$_libcurl_with" != "no" ; then @@ -82,7 +82,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`]) _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` - _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse` + _libcurl_wanted=`echo m4_if([$2],,[0],[$2]) | $_libcurl_version_parse` if test $_libcurl_wanted -gt 0 ; then AC_CACHE_CHECK([for libcurl >= version $2], @@ -141,7 +141,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], _libcurl_save_libs=$LIBS LIBS="$LIBCURL $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; @@ -152,7 +152,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 @@ -251,10 +251,10 @@ x=CURLOPT_VERBOSE; if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then # This is the IF-NO path - ifelse([$4],,:,[$4]) + m4_if([$4],,:,[$4]) else # This is the IF-YES path - ifelse([$3],,:,[$3]) + m4_if([$3],,:,[$3]) fi unset _libcurl_with diff --git a/m4/libusb.m4 b/m4/libusb.m4 index 809dc1dd9..6f2460e10 100644 --- a/m4/libusb.m4 +++ b/m4/libusb.m4 @@ -43,9 +43,9 @@ AC_DEFUN([GNUPG_CHECK_LIBUSB], AC_MSG_CHECKING([whether libusb is present and sane]) - AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <usb.h>],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <usb.h>]],[[ usb_bulk_write(NULL,0,NULL,0,0); -]),_found_libusb=yes,_found_libusb=no) +]])],_found_libusb=yes,_found_libusb=no) AC_MSG_RESULT([$_found_libusb]) diff --git a/m4/readline.m4 b/m4/readline.m4 index d25234605..f3be681fb 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -30,18 +30,18 @@ AC_DEFUN([GNUPG_CHECK_READLINE], AC_MSG_CHECKING([whether readline via \"$_combo\" is present and sane]) - AC_LINK_IFELSE(AC_LANG_PROGRAM([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> #include <readline/readline.h> #include <readline/history.h> -],[ +]],[[ rl_completion_func_t *completer; add_history("foobar"); rl_catch_signals=0; rl_inhibit_completion=0; rl_attempted_completion_function=NULL; rl_completion_matches(NULL,NULL); -]),_found_readline=yes,_found_readline=no) +]])],_found_readline=yes,_found_readline=no) AC_MSG_RESULT([$_found_readline]) |