Download as
Browse Code »

Commit daad203b477a1118170a1803dc97630832ec5a4d

Authored by Perry Werneck
1 parent 4361b403
Exists in master and in 2 other branches develop, macos

Fixing libcurl detection in macos (#25)

Showing 1 changed file with 27 additions and 17 deletions   Show diff stats
configure.ac
  Diff comments   View file @daad203
... ... @@ -641,25 +641,35 @@ dnl ---------------------------------------------------------------------------
641 641 dnl Check for CURL
642 642 dnl ---------------------------------------------------------------------------
643 643  
644   -AC_ARG_ENABLE([curl],
645   - AS_HELP_STRING([--disable-curl],[Disable use of libcurl]),
646   - [case "${enableval}" in
647   - yes) have_curl=yes ;;
648   - no) have_curl=no ;;
649   - *) AC_MSG_ERROR(bad value ${enableval} for --disable-curl);;
650   - esac],
651   - [case "$host" in
652   - *-mingw32|*-pc-msys) have_curl=no ;;
653   - *) have_curl=yes;;
654   - esac])
655   -
  644 +case "$host" in
656 645  
657   -if test "x${have_curl}" != xno ; then
658   - PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL,[],[Do we have libcurl?]), AC_MSG_ERROR([libcurl not present.]) )
659   -fi
  646 + *-mingw32|*-pc-msys)
  647 + AC_SUBST(LIBCURL_LIBS)
  648 + AC_SUBST(LIBCURL_CFLAGS)
  649 + ;;
660 650  
661   -AC_SUBST(LIBCURL_LIBS)
662   -AC_SUBST(LIBCURL_CFLAGS)
  651 + *-apple-darwin*)
  652 + AC_PATH_TOOL([CURLCONFIG], [curl-config], [no])
  653 +
  654 + if test x$CURLCONFIG = xno; then
  655 + AC_MSG_NOTICE([Building without CURL support])
  656 + AC_SUBST(LIBCURL_CFLAGS)
  657 + AC_SUBST(LIBCURL_LIBS)
  658 + else
  659 + AC_MSG_NOTICE([Using $($CURLCONFIG --version)])
  660 + AC_DEFINE(HAVE_LIBCURL,[],[Do we have libcurl?])
  661 + AC_SUBST(LIBCURL_CFLAGS,"$($CURLCONFIG --cflags)")
  662 + AC_SUBST(LIBCURL_LIBS,"$($CURLCONFIG --libs)")
  663 + fi
  664 + ;;
  665 +
  666 + *)
  667 + PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL,[],[Do we have libcurl?]), AC_MSG_ERROR([libcurl not present.]) )
  668 + AC_SUBST(LIBCURL_CFLAGS)
  669 + AC_SUBST(LIBCURL_LIBS)
  670 + ;;
  671 +
  672 +esac
663 673  
664 674 dnl ---------------------------------------------------------------------------
665 675 dnl Directory config
... ...