mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-30 06:47:49 +08:00
4935f12b6d
* take changes from fontconfig pr * [farmhash] add autoconf * [freexl] add autoconf * [healpix] add autoconf * [libb2] add autoconf * [libwandio] add autoconf and patch * more autoconf * [x264] fix windows build issues * minimal cleanup * [libwandio] some fixes * [vcpkg/scripts/make] add include to C/CXX flags correctly set machine flags for linker * remove unnecessary comments part 1 * cleanup part 2 * cleanup * remove unnecessary code * [pbc] fix osx regressions * [lzokay] format manifest * try to copy sources to fix build issues * add autoconfig to force updated configure scripts * bump port versions of openmpi and ocilib * added lib paths back into vcpkg_build_make because they are probably required * Use CPP flags add quotes around restoring of ENV add LIB and LIBPATH correctly * Apply suggestions from code review Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Apply more changes forom CR - remove mingw make - add doc for missing options - introduce two new macros for backup/restore of env vars * fix wrong variables. * use the list macro instead of the single var macro * also use it at the top Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
diff --git a/configure.ac b/configure.ac
|
|
index 4579fbb3d..f6be008c8 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -296,12 +304,14 @@ AC_ARG_WITH([http],
|
|
AS_IF([test "x$with_http" != "xno"],
|
|
[
|
|
# we need curl_easy_pause which was added in 7.18.0
|
|
- AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)
|
|
+ AC_SEARCH_LIBS(curl_easy_pause, [curl curl-d], have_curl=yes, have_curl=no, [-lssl -lcrypto $ac_cv_search_pthread_create -ldl])
|
|
+ # AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)
|
|
], [have_curl=no])
|
|
|
|
AS_IF([test "x$have_curl" = "xyes"], [
|
|
- if test "$ac_cv_lib_curl_curl_easy_pause" != "none required"; then
|
|
- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lcurl"
|
|
+ if test "$ac_cv_search_curl_easy_pause" != "none required"; then
|
|
+ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_curl_easy_pause -lssl -lcrypto $ac_cv_search_pthread_create -ldl"
|
|
+ LIBS="$LIBS -lssl -lcrypto $ac_cv_search_pthread_create -ldl"
|
|
fi
|
|
AC_DEFINE(HAVE_HTTP, 1, "Compiled with http support")
|
|
with_http=yes],
|