Commit 04045b1aad453c8f1aaf04f1efca0b1d6ccbc718
1 parent
608434d7
Exists in
master
and in
3 other branches
Use of curl is now default on linux.
Showing
1 changed file
with
6 additions
and
3 deletions
Show diff stats
configure.ac
| @@ -604,17 +604,20 @@ dnl Check for CURL | @@ -604,17 +604,20 @@ dnl Check for CURL | ||
| 604 | dnl --------------------------------------------------------------------------- | 604 | dnl --------------------------------------------------------------------------- |
| 605 | 605 | ||
| 606 | AC_ARG_ENABLE([curl], | 606 | AC_ARG_ENABLE([curl], |
| 607 | - AS_HELP_STRING([--enable-curl],[Enable optional CURL support]), | 607 | + AS_HELP_STRING([--disable-curl],[Disable use of libcurl]), |
| 608 | [case "${enableval}" in | 608 | [case "${enableval}" in |
| 609 | yes) have_curl=yes ;; | 609 | yes) have_curl=yes ;; |
| 610 | no) have_curl=no ;; | 610 | no) have_curl=no ;; |
| 611 | *) AC_MSG_ERROR(bad value ${enableval} for --disable-curl);; | 611 | *) AC_MSG_ERROR(bad value ${enableval} for --disable-curl);; |
| 612 | esac], | 612 | esac], |
| 613 | - [have_curl=no]) | 613 | + [case "$host" in |
| 614 | + *-mingw32|*-pc-msys) have_curl=no ;; | ||
| 615 | + *) have_curl=yes;; | ||
| 616 | + esac]) | ||
| 614 | 617 | ||
| 615 | 618 | ||
| 616 | if test "x${have_curl}" != xno ; then | 619 | if test "x${have_curl}" != xno ; then |
| 617 | - PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL), AC_MSG_NOTICE([libcurl not present.]) ) | 620 | + PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL), AC_MSG_ERROR([libcurl not present.]) ) |
| 618 | fi | 621 | fi |
| 619 | 622 | ||
| 620 | AC_SUBST(LIBCURL_LIBS) | 623 | AC_SUBST(LIBCURL_LIBS) |