Ticket #20523: libcurl_https_support.patch

File libcurl_https_support.patch, 3.0 KB (added by jpflori, 5 years ago)

Remove check for https support in curl.

  • configure

    diff -druN R-3.3.1/configure R-3.3.1.patched/configure
    old new  
    3622736227  have_libcurl=no
    3622836228fi
    3622936229
    36230 if test "x${have_libcurl}" = "xyes"; then
    36231 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libcurl supports https" >&5
    36232 $as_echo_n "checking if libcurl supports https... " >&6; }
    36233 if ${r_cv_have_curl_https+:} false; then :
    36234   $as_echo_n "(cached) " >&6
    36235 else
    36236   if test "$cross_compiling" = yes; then :
    36237   r_cv_have_curl_https=no
    36238 else
    36239   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    36240 /* end confdefs.h.  */
    36241 
    36242 #include <string.h>
    36243 #include <curl/curl.h>
    36244 int main()
    36245 {
    36246     curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
    36247     const char * const *p  = data->protocols;
    36248     int found = 0;
    36249     for (; *p; p++)
    36250         if(strcmp(*p, "https") == 0) {found = 1; break;}
    36251     exit(found ? 0 : 1);
    36252 }
    36253 
    36254 _ACEOF
    36255 if ac_fn_c_try_run "$LINENO"; then :
    36256   r_cv_have_curl_https=yes
    36257 else
    36258   r_cv_have_curl_https=no
    36259 fi
    36260 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
    36261   conftest.$ac_objext conftest.beam conftest.$ac_ext
    36262 fi
    36263 
    36264 fi
    36265 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $r_cv_have_curl_https" >&5
    36266 $as_echo "$r_cv_have_curl_https" >&6; }
    36267 fi
    36268 if test "x${r_cv_have_curl_https}" = xno; then
    36269   have_libcurl=no
    36270 fi
    3627136230if test "x${have_libcurl}" = xyes; then
    3627236231
    3627336232$as_echo "#define HAVE_LIBCURL 1" >>confdefs.h
     
    3627736236
    3627836237
    3627936238else
    36280   as_fn_error $? "libcurl >= 7.28.0 library and headers are required with support for https" "$LINENO" 5
     36239  as_fn_error $? "libcurl >= 7.28.0 library and headers are required" "$LINENO" 5
    3628136240fi
    3628236241
    3628336242
  • m4/R.m4

    diff -druN R-3.3.1/m4/R.m4 R-3.3.1.patched/m4/R.m4
    old new  
    41964196  have_libcurl=no
    41974197fi
    41984198
    4199 if test "x${have_libcurl}" = "xyes"; then
    4200 AC_CACHE_CHECK([if libcurl supports https], [r_cv_have_curl_https],
    4201 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
    4202 #include <string.h>
    4203 #include <curl/curl.h>
    4204 int main()
    4205 {
    4206     curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
    4207     const char * const *p  = data->protocols;
    4208     int found = 0;
    4209     for (; *p; p++)
    4210         if(strcmp(*p, "https") == 0) {found = 1; break;}
    4211     exit(found ? 0 : 1);
    4212 }
    4213 ]])], [r_cv_have_curl_https=yes], [r_cv_have_curl_https=no], [r_cv_have_curl_https=no])])
    4214 fi
    4215 if test "x${r_cv_have_curl_https}" = xno; then
    4216   have_libcurl=no
    4217 fi
    42184199if test "x${have_libcurl}" = xyes; then
    4219   AC_DEFINE(HAVE_LIBCURL, 1, [Define if your system has libcurl >= 7.28.0 with support for https.])
     4200  AC_DEFINE(HAVE_LIBCURL, 1, [Define if your system has libcurl >= 7.28.0.])
    42204201  CPPFLAGS="${r_save_CPPFLAGS}"
    42214202  LIBS="${r_save_LIBS}"
    42224203  AC_SUBST(CURL_CPPFLAGS)
    42234204  AC_SUBST(CURL_LIBS)
    42244205else
    4225   AC_MSG_ERROR([libcurl >= 7.28.0 library and headers are required with support for https])
     4206  AC_MSG_ERROR([libcurl >= 7.28.0 library and headers are required])
    42264207fi
    42274208])# R_LIBCURL
    42284209