diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-27 21:48:51 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-27 21:48:51 +0000 |
| commit | 73107f78524005afa8469ec3f706c0caf9c9fdbd (patch) | |
| tree | 4cb7669bae9c8736b8d1d29aa096d4fb5aac0f7a /configure.ac | |
| parent | 5211b1d3226a9fffa22c323f57b505ca8c9a06fe (diff) | |
Merged revisions 214518 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r214518 | tilghman | 2009-08-27 16:46:46 -0500 (Thu, 27 Aug 2009) | 14 lines
Merged revisions 214517 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r214517 | tilghman | 2009-08-27 16:45:34 -0500 (Thu, 27 Aug 2009) | 7 lines
Use autoconf to detect libcurl, as this enables cross-compilation checks, something we didn't allow before.
(closes issue #15714)
Reported by: pprindeville
Patches:
20090813__issue15714.diff.txt uploaded by tilghman (license 14)
Tested by: pprindeville
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@214520 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index 3465fcd3e..f90c08762 100644 --- a/configure.ac +++ b/configure.ac @@ -1575,37 +1575,7 @@ AC_SUBST(PBX_GTK2) AC_SUBST(GTK2_INCLUDE) AC_SUBST(GTK2_LIB) -if test "${USE_CURL}" != "no"; then - AC_PATH_TOOL([CURL_CONFIG], [curl-config], No) - if test ! x"${CURL_CONFIG}" = xNo; then - # check for version - if test $(printf "%d" 0x$(${CURL_CONFIG} --vernum)) -ge $(printf "%d" 0x070907); then - CURL_INCLUDE=$(${CURL_CONFIG} --cflags) - CURL_LIB=$(${CURL_CONFIG} --libs) - - AC_MSG_CHECKING(for curl_version() in curl/curl.h) - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${CURL_INCLUDE}" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [#include <curl/curl.h>], - [curl_version();]) - ],[ - AC_MSG_RESULT(yes) - ac_cv_curl_h="yes" - ],[ - AC_MSG_RESULT(no) - ac_cv_curl_h="no" - ] - ) - CPPFLAGS="${saved_cppflags}" - if test "${ac_cv_curl_h}" = "yes"; then - PBX_CURL=1 - AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.]) - fi - fi - fi -fi +AST_LIBCURL_CHECK_CONFIG([], [7.10.1]) AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile]) AST_CHECK_MANDATORY |