Merged revisions 94077 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r94077 | russell | 2007-12-19 16:48:48 -0600 (Wed, 19 Dec 2007) | 4 lines Check for the existence of the soxmix application on the target platform and have the result available in autoconfig.h. (part of issue #11589) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
parent
d36381e629
commit
0e08d5e7dc
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 93211 .
|
||||
# From configure.ac Revision: 93898 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
|
||||
#
|
||||
|
|
@ -714,6 +714,7 @@ WGET
|
|||
RUBBER
|
||||
FETCH
|
||||
DOWNLOAD
|
||||
SOXMIX
|
||||
acx_pthread_config
|
||||
PTHREAD_CC
|
||||
PTHREAD_LIBS
|
||||
|
|
@ -7300,6 +7301,110 @@ fi
|
|||
fi
|
||||
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}soxmix", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}soxmix; 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_prog_SOXMIX+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$SOXMIX"; then
|
||||
ac_cv_prog_SOXMIX="$SOXMIX" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
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_prog_SOXMIX="${ac_tool_prefix}soxmix"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
SOXMIX=$ac_cv_prog_SOXMIX
|
||||
if test -n "$SOXMIX"; then
|
||||
{ echo "$as_me:$LINENO: result: $SOXMIX" >&5
|
||||
echo "${ECHO_T}$SOXMIX" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_SOXMIX"; then
|
||||
ac_ct_SOXMIX=$SOXMIX
|
||||
# Extract the first word of "soxmix", so it can be a program name with args.
|
||||
set dummy soxmix; 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_prog_ac_ct_SOXMIX+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$ac_ct_SOXMIX"; then
|
||||
ac_cv_prog_ac_ct_SOXMIX="$ac_ct_SOXMIX" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
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_prog_ac_ct_SOXMIX="soxmix"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_SOXMIX=$ac_cv_prog_ac_ct_SOXMIX
|
||||
if test -n "$ac_ct_SOXMIX"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_ct_SOXMIX" >&5
|
||||
echo "${ECHO_T}$ac_ct_SOXMIX" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_ct_SOXMIX" = x; then
|
||||
SOXMIX=":"
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||||
echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
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
|
||||
SOXMIX=$ac_ct_SOXMIX
|
||||
fi
|
||||
else
|
||||
SOXMIX="$ac_cv_prog_SOXMIX"
|
||||
fi
|
||||
|
||||
if test "${SOXMIX}" != ":" ; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_SOXMIX 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -12594,11 +12699,13 @@ _ACEOF
|
|||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h> /* for off_t */
|
||||
#include <stdio.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
|
||||
int (*fp) (FILE *, off_t, int) = fseeko;
|
||||
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -12638,11 +12745,13 @@ cat confdefs.h >>conftest.$ac_ext
|
|||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#define _LARGEFILE_SOURCE 1
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h> /* for off_t */
|
||||
#include <stdio.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
|
||||
int (*fp) (FILE *, off_t, int) = fseeko;
|
||||
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -48036,9 +48145,9 @@ WGET!$WGET$ac_delim
|
|||
RUBBER!$RUBBER$ac_delim
|
||||
FETCH!$FETCH$ac_delim
|
||||
DOWNLOAD!$DOWNLOAD$ac_delim
|
||||
SOXMIX!$SOXMIX$ac_delim
|
||||
acx_pthread_config!$acx_pthread_config$ac_delim
|
||||
PTHREAD_CC!$PTHREAD_CC$ac_delim
|
||||
PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -48080,6 +48189,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
|
||||
PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
|
||||
AST_DEVMODE!$AST_DEVMODE$ac_delim
|
||||
ALSA_LIB!$ALSA_LIB$ac_delim
|
||||
|
|
@ -48176,7 +48286,6 @@ OSPTK_DIR!$OSPTK_DIR$ac_delim
|
|||
PBX_OSPTK!$PBX_OSPTK$ac_delim
|
||||
OSS_LIB!$OSS_LIB$ac_delim
|
||||
OSS_INCLUDE!$OSS_INCLUDE$ac_delim
|
||||
OSS_DIR!$OSS_DIR$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -48218,6 +48327,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
OSS_DIR!$OSS_DIR$ac_delim
|
||||
PBX_OSS!$PBX_OSS$ac_delim
|
||||
POPT_LIB!$POPT_LIB$ac_delim
|
||||
POPT_INCLUDE!$POPT_INCLUDE$ac_delim
|
||||
|
|
@ -48314,7 +48424,6 @@ PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
|
|||
ZAPTEL_TRANSCODE_LIB!$ZAPTEL_TRANSCODE_LIB$ac_delim
|
||||
ZAPTEL_TRANSCODE_INCLUDE!$ZAPTEL_TRANSCODE_INCLUDE$ac_delim
|
||||
ZAPTEL_TRANSCODE_DIR!$ZAPTEL_TRANSCODE_DIR$ac_delim
|
||||
PBX_ZAPTEL_TRANSCODE!$PBX_ZAPTEL_TRANSCODE$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -48356,6 +48465,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
PBX_ZAPTEL_TRANSCODE!$PBX_ZAPTEL_TRANSCODE$ac_delim
|
||||
ZAPTEL_VLDTMF_LIB!$ZAPTEL_VLDTMF_LIB$ac_delim
|
||||
ZAPTEL_VLDTMF_INCLUDE!$ZAPTEL_VLDTMF_INCLUDE$ac_delim
|
||||
ZAPTEL_VLDTMF_DIR!$ZAPTEL_VLDTMF_DIR$ac_delim
|
||||
|
|
@ -48405,7 +48515,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim
|
|||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
|
|||
|
|
@ -170,6 +170,11 @@ else
|
|||
fi
|
||||
AC_SUBST(DOWNLOAD)
|
||||
|
||||
AC_CHECK_TOOL([SOXMIX], [soxmix], [:])
|
||||
if test "${SOXMIX}" != ":" ; then
|
||||
AC_DEFINE([HAVE_SOXMIX], 1, [Define to 1 if your system has soxmix application.])
|
||||
fi
|
||||
|
||||
ACX_PTHREAD
|
||||
|
||||
AC_LANG(C)
|
||||
|
|
|
|||
|
|
@ -689,6 +689,9 @@
|
|||
/* Define to 1 if you have the `socket' function. */
|
||||
#undef HAVE_SOCKET
|
||||
|
||||
/* Define to 1 if your system has soxmix application. */
|
||||
#undef HAVE_SOXMIX
|
||||
|
||||
/* Define this to indicate the ${SPEEX_DESCRIP} library */
|
||||
#undef HAVE_SPEEX
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue