FSBUILD-285: Fix build with --with-curl
This commit is contained in:
parent
a763fd434a
commit
e704f02196
|
@ -725,6 +725,10 @@ AC_ARG_WITH(libcurl,
|
||||||
AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
|
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=ifelse([$1],,[yes],[$1])])
|
||||||
|
|
||||||
|
AC_CACHE_CHECK([whether to use system libcurl library], [ac_cv_use_system_curl], [
|
||||||
|
LIBCURL_CHECK_CONFIG([yes], [7.13.0], [ac_cv_use_system_curl='yes'], [ac_cv_use_system_curl='no'])
|
||||||
|
])
|
||||||
|
|
||||||
if test "$_libcurl_with" = "no" ; then
|
if test "$_libcurl_with" = "no" ; then
|
||||||
ac_cv_use_system_curl=no;
|
ac_cv_use_system_curl=no;
|
||||||
fi
|
fi
|
||||||
|
@ -732,10 +736,6 @@ if test "$_libcurl_with" = "yes" ; then
|
||||||
ac_cv_use_system_curl=yes;
|
ac_cv_use_system_curl=yes;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CACHE_CHECK([whether to use system libcurl library], [ac_cv_use_system_curl], [
|
|
||||||
LIBCURL_CHECK_CONFIG([yes], [7.13.0], [ac_cv_use_system_curl='yes'], [ac_cv_use_system_curl='no'])
|
|
||||||
])
|
|
||||||
|
|
||||||
if test "$ac_cv_use_system_curl" != "yes" ; then
|
if test "$ac_cv_use_system_curl" != "yes" ; then
|
||||||
LIBCURL_DEPS='${switch_builddir}/libs/curl/lib/libcurl.la'
|
LIBCURL_DEPS='${switch_builddir}/libs/curl/lib/libcurl.la'
|
||||||
LIBCURL='${switch_builddir}/libs/curl/lib/libcurl.la'
|
LIBCURL='${switch_builddir}/libs/curl/lib/libcurl.la'
|
||||||
|
|
Loading…
Reference in New Issue