mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 11:58:52 +00:00
since we use AC_PATH_TOOL to find tools, we should use the results it provides for us (reported by Brian Capouch on the asterisk-dev list)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@49866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
62
configure
vendored
62
configure
vendored
@@ -853,7 +853,7 @@ GTKCONFIG
|
||||
PBX_GTK
|
||||
GTK_INCLUDE
|
||||
GTK_LIB
|
||||
CURL
|
||||
CURL_CONFIG
|
||||
LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
ac_precious_vars='build_alias
|
||||
@@ -19677,7 +19677,7 @@ fi
|
||||
fi
|
||||
fi
|
||||
if test x"${NETSNMP_CONFIG}" != xNo; then
|
||||
NETSNMP_libs=`net-snmp-config --agent-libs`
|
||||
NETSNMP_libs=`${NETSNMP_CONFIG} --agent-libs`
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for snmp_register_callback in -lnetsnmp" >&5
|
||||
echo $ECHO_N "checking for snmp_register_callback in -lnetsnmp... $ECHO_C" >&6; }
|
||||
@@ -22275,8 +22275,8 @@ fi
|
||||
fi
|
||||
fi
|
||||
if test "${PG_CONFIG}" != No; then
|
||||
PGSQL_libdir=`pg_config --libdir`
|
||||
PGSQL_includedir=`pg_config --includedir`
|
||||
PGSQL_libdir=`${PG_CONFIG} --libdir`
|
||||
PGSQL_includedir=`${PG_CONFIG} --includedir`
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for PQexec in -lpq" >&5
|
||||
echo $ECHO_N "checking for PQexec in -lpq... $ECHO_C" >&6; }
|
||||
@@ -28967,12 +28967,12 @@ if test "${USE_CURL}" != "no"; then
|
||||
set dummy ${ac_tool_prefix}curl-config; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_path_CURL+set}" = set; then
|
||||
if test "${ac_cv_path_CURL_CONFIG+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $CURL in
|
||||
case $CURL_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_CURL="$CURL" # Let the user override the test with a path.
|
||||
ac_cv_path_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
@@ -28982,7 +28982,7 @@ do
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_CURL="$as_dir/$ac_word$ac_exec_ext"
|
||||
ac_cv_path_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
@@ -28993,10 +28993,10 @@ IFS=$as_save_IFS
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
CURL=$ac_cv_path_CURL
|
||||
if test -n "$CURL"; then
|
||||
{ echo "$as_me:$LINENO: result: $CURL" >&5
|
||||
echo "${ECHO_T}$CURL" >&6; }
|
||||
CURL_CONFIG=$ac_cv_path_CURL_CONFIG
|
||||
if test -n "$CURL_CONFIG"; then
|
||||
{ echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5
|
||||
echo "${ECHO_T}$CURL_CONFIG" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
@@ -29004,18 +29004,18 @@ fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_path_CURL"; then
|
||||
ac_pt_CURL=$CURL
|
||||
if test -z "$ac_cv_path_CURL_CONFIG"; then
|
||||
ac_pt_CURL_CONFIG=$CURL_CONFIG
|
||||
# Extract the first word of "curl-config", so it can be a program name with args.
|
||||
set dummy curl-config; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_path_ac_pt_CURL+set}" = set; then
|
||||
if test "${ac_cv_path_ac_pt_CURL_CONFIG+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $ac_pt_CURL in
|
||||
case $ac_pt_CURL_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_ac_pt_CURL="$ac_pt_CURL" # Let the user override the test with a path.
|
||||
ac_cv_path_ac_pt_CURL_CONFIG="$ac_pt_CURL_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
@@ -29025,7 +29025,7 @@ do
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_ac_pt_CURL="$as_dir/$ac_word$ac_exec_ext"
|
||||
ac_cv_path_ac_pt_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
@@ -29036,17 +29036,17 @@ IFS=$as_save_IFS
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
ac_pt_CURL=$ac_cv_path_ac_pt_CURL
|
||||
if test -n "$ac_pt_CURL"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_pt_CURL" >&5
|
||||
echo "${ECHO_T}$ac_pt_CURL" >&6; }
|
||||
ac_pt_CURL_CONFIG=$ac_cv_path_ac_pt_CURL_CONFIG
|
||||
if test -n "$ac_pt_CURL_CONFIG"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_pt_CURL_CONFIG" >&5
|
||||
echo "${ECHO_T}$ac_pt_CURL_CONFIG" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_pt_CURL" = x; then
|
||||
CURL="No"
|
||||
if test "x$ac_pt_CURL_CONFIG" = x; then
|
||||
CURL_CONFIG="No"
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
@@ -29058,17 +29058,17 @@ whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
CURL=$ac_pt_CURL
|
||||
CURL_CONFIG=$ac_pt_CURL_CONFIG
|
||||
fi
|
||||
else
|
||||
CURL="$ac_cv_path_CURL"
|
||||
CURL_CONFIG="$ac_cv_path_CURL_CONFIG"
|
||||
fi
|
||||
|
||||
if test ! x"${CURL}" = xNo; then
|
||||
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} --cflags)
|
||||
CURL_LIB=$(${CURL} --libs)
|
||||
if test $(printf "%d" 0x$(${CURL_CONFIG} --vernum)) -ge $(printf "%d" 0x070907); then
|
||||
CURL_INCLUDE=$(${CURL_CONFIG} --cflags)
|
||||
CURL_LIB=$(${CURL_CONFIG} --libs)
|
||||
PBX_CURL=1
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
@@ -30015,7 +30015,7 @@ GTKCONFIG!$GTKCONFIG$ac_delim
|
||||
PBX_GTK!$PBX_GTK$ac_delim
|
||||
GTK_INCLUDE!$GTK_INCLUDE$ac_delim
|
||||
GTK_LIB!$GTK_LIB$ac_delim
|
||||
CURL!$CURL$ac_delim
|
||||
CURL_CONFIG!$CURL_CONFIG$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
|
||||
16
configure.ac
16
configure.ac
@@ -629,7 +629,7 @@ if test "${USE_NETSNMP}" != "no"; then
|
||||
fi
|
||||
fi
|
||||
if test x"${NETSNMP_CONFIG}" != xNo; then
|
||||
NETSNMP_libs=`net-snmp-config --agent-libs`
|
||||
NETSNMP_libs=`${NETSNMP_CONFIG} --agent-libs`
|
||||
|
||||
AC_CHECK_LIB([netsnmp], [snmp_register_callback], AC_DEFINE_UNQUOTED([HAVE_NETSNMP], 1,
|
||||
[Define to indicate the Net-SNMP library]), [], ${NETSNMP_libs})
|
||||
@@ -696,8 +696,8 @@ if test "${USE_PGSQL}" != "no"; then
|
||||
fi
|
||||
fi
|
||||
if test "${PG_CONFIG}" != No; then
|
||||
PGSQL_libdir=`pg_config --libdir`
|
||||
PGSQL_includedir=`pg_config --includedir`
|
||||
PGSQL_libdir=`${PG_CONFIG} --libdir`
|
||||
PGSQL_includedir=`${PG_CONFIG} --includedir`
|
||||
|
||||
AC_CHECK_LIB([pq], [PQexec], AC_DEFINE_UNQUOTED([HAVE_PGSQL], 1,
|
||||
[Define to indicate the PostgreSQL library]), [], -L${PGSQL_libdir} -lz)
|
||||
@@ -1064,12 +1064,12 @@ AC_SUBST(GTK_INCLUDE)
|
||||
AC_SUBST(GTK_LIB)
|
||||
|
||||
if test "${USE_CURL}" != "no"; then
|
||||
AC_PATH_TOOL([CURL], [curl-config], No)
|
||||
if test ! x"${CURL}" = xNo; 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} --cflags)
|
||||
CURL_LIB=$(${CURL} --libs)
|
||||
if test $(printf "%d" 0x$(${CURL_CONFIG} --vernum)) -ge $(printf "%d" 0x070907); then
|
||||
CURL_INCLUDE=$(${CURL_CONFIG} --cflags)
|
||||
CURL_LIB=$(${CURL_CONFIG} --libs)
|
||||
PBX_CURL=1
|
||||
AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user