kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 214518 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@214520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-08-27 21:48:51 +00:00
parent 9ef9784635
commit b8d68dcb9b
4 changed files with 707 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
configure.ac
View File

@@ -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