kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

get cflags for libcurl as well as libs (patch from qwell)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-08-25 00:13:03 +00:00
parent 310cb52bb4
commit 5008225fcf
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 40837 . # From configure.ac Revision: 40949 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60. # Generated by GNU Autoconf 2.60.
# #
@@ -810,7 +810,8 @@ GTK_INCLUDE
GTK_LIB GTK_LIB
CURL CURL
PBX_CURL PBX_CURL
CURLLIB CURL_INCLUDE
CURL_LIB
LTLIBOBJS' LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
ac_precious_vars='build_alias ac_precious_vars='build_alias
@@ -29441,7 +29442,8 @@ if test ! x"${CURL}" = xNo; then
# check for version # check for version
if test "${host_os}" = "SunOS"; then if test "${host_os}" = "SunOS"; then
if [ 0x`curl-config --vernum` -ge 0x70907 ]; then if [ 0x`curl-config --vernum` -ge 0x70907 ]; then
CURLLIB=$(${CURL} --libs) CURL_INCLUDE=$(${CURL} --cflags)
CURL_LIB=$(${CURL} --libs)
PBX_CURL=1 PBX_CURL=1
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
@@ -29451,7 +29453,8 @@ _ACEOF
fi fi
else else
if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then
CURLLIB=$(${CURL} --libs) CURL_INCLUDE=$(${CURL} --cflags)
CURL_LIB=$(${CURL} --libs)
PBX_CURL=1 PBX_CURL=1
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
@@ -29464,6 +29467,7 @@ fi
ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts" ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
@@ -30360,11 +30364,12 @@ GTK_INCLUDE!$GTK_INCLUDE$ac_delim
GTK_LIB!$GTK_LIB$ac_delim GTK_LIB!$GTK_LIB$ac_delim
CURL!$CURL$ac_delim CURL!$CURL$ac_delim
PBX_CURL!$PBX_CURL$ac_delim PBX_CURL!$PBX_CURL$ac_delim
CURLLIB!$CURLLIB$ac_delim CURL_INCLUDE!$CURL_INCLUDE$ac_delim
CURL_LIB!$CURL_LIB$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

9
configure.ac
View File

@@ -917,20 +917,23 @@ if test ! x"${CURL}" = xNo; then
# check for version # check for version
if test "${host_os}" = "SunOS"; then if test "${host_os}" = "SunOS"; then
if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then
CURLLIB=$(${CURL} --libs) CURL_INCLUDE=$(${CURL} --cflags)
CURL_LIB=$(${CURL} --libs)
PBX_CURL=1 PBX_CURL=1
AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.]) AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
fi fi
else else
if [[[ 0x`curl-config --vernum` -ge 0x70907 ]]]; then if [[[ 0x`curl-config --vernum` -ge 0x70907 ]]]; then
CURLLIB=$(${CURL} --libs) CURL_INCLUDE=$(${CURL} --cflags)
CURL_LIB=$(${CURL} --libs)
PBX_CURL=1 PBX_CURL=1
AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.]) AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
fi fi
fi fi
fi fi
AC_SUBST(PBX_CURL) AC_SUBST(PBX_CURL)
AC_SUBST(CURLLIB) AC_SUBST(CURL_INCLUDE)
AC_SUBST(CURL_LIB)
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts]) AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
AC_OUTPUT AC_OUTPUT

3
makeopts.in
View File

@@ -53,7 +53,8 @@ AST_DEVMODE=@AST_DEVMODE@
ASOUND_INCLUDE=@ALSA_INCLUDE@ ASOUND_INCLUDE=@ALSA_INCLUDE@
ASOUND_LIB=@ALSA_LIB@ ASOUND_LIB=@ALSA_LIB@
CURL_LIB=@CURLLIB@ CURL_INCLUDE=@CURL_INCLUDE@
CURL_LIB=@CURL_LIB@
CURSES_INCLUDE=@CURSES_INCLUDE@ CURSES_INCLUDE=@CURSES_INCLUDE@
CURSES_LIB=@CURSES_LIB@ CURSES_LIB=@CURSES_LIB@