← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnupg2/raring-proposed

« back to all changes in this revision

Viewing changes to m4/libcurl.m4

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2012-11-06 11:25:58 UTC
  • mfrom: (14.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20121106112558-kxptsug6ivixhx8m
Tags: 2.0.19-1ubuntu1
* Resynchronize on Debian, remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/libcurl.m4
58
58
 
59
59
  AC_ARG_WITH(libcurl,
60
60
     AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
61
 
     [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
 
61
     [_libcurl_with=$withval],[_libcurl_with=m4_if([$1],,[yes],[$1])])
62
62
 
63
63
  if test "$_libcurl_with" != "no" ; then
64
64
 
82
82
           [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
83
83
 
84
84
        _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
85
 
        _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
 
85
        _libcurl_wanted=`echo m4_if([$2],,[0],[$2]) | $_libcurl_version_parse`
86
86
 
87
87
        if test $_libcurl_wanted -gt 0 ; then
88
88
           AC_CACHE_CHECK([for libcurl >= version $2],
141
141
           _libcurl_save_libs=$LIBS
142
142
           LIBS="$LIBCURL $LIBS"
143
143
 
144
 
           AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
 
144
           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[
145
145
/* Try and use a few common options to force a failure if we are
146
 
   missing symbols or can't link. */
 
146
   missing symbols or cannot link. */
147
147
int x;
148
148
curl_easy_setopt(NULL,CURLOPT_URL,NULL);
149
149
x=CURL_ERROR_SIZE;
152
152
x=CURLOPT_ERRORBUFFER;
153
153
x=CURLOPT_STDERR;
154
154
x=CURLOPT_VERBOSE;
155
 
]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
 
155
]])],[libcurl_cv_lib_curl_usable=yes],[libcurl_cv_lib_curl_usable=no])
156
156
 
157
157
           CPPFLAGS=$_libcurl_save_cppflags
158
158
           LIBS=$_libcurl_save_libs
229
229
 
230
230
  if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
231
231
     # This is the IF-NO path
232
 
     ifelse([$4],,:,[$4])
 
232
     m4_if([$4],,:,[$4])
233
233
  else
234
234
     # This is the IF-YES path
235
 
     ifelse([$3],,:,[$3])
 
235
     m4_if([$3],,:,[$3])
236
236
  fi
237
237
 
238
238
  unset _libcurl_with