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/branches/1.4@94077 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index f296f05ae1ddd8c5c01c305b22d14c2e3534d51e..9b9241f7c3fc158d3f515fcc1bc4e2d0c379317b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 92463 .
+# From configure.ac Revision: 93180 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.4.
 #
@@ -712,6 +712,7 @@ DOT
 WGET
 FETCH
 DOWNLOAD
+SOXMIX
 acx_pthread_config
 PTHREAD_CC
 PTHREAD_LIBS
@@ -7183,6 +7184,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
+
 
 
 
@@ -34166,11 +34271,11 @@ DOT!$DOT$ac_delim
 WGET!$WGET$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
 PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
-AST_DEVMODE!$AST_DEVMODE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -34212,6 +34317,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+AST_DEVMODE!$AST_DEVMODE$ac_delim
 ALSA_LIB!$ALSA_LIB$ac_delim
 ALSA_INCLUDE!$ALSA_INCLUDE$ac_delim
 ALSA_DIR!$ALSA_DIR$ac_delim
@@ -34308,7 +34414,6 @@ OPENH323_LIB!$OPENH323_LIB$ac_delim
 OPENH323_INCLUDE!$OPENH323_INCLUDE$ac_delim
 OPENH323_DIR!$OPENH323_DIR$ac_delim
 PBX_OPENH323!$PBX_OPENH323$ac_delim
-QT_LIB!$QT_LIB$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -34350,6 +34455,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+QT_LIB!$QT_LIB$ac_delim
 QT_INCLUDE!$QT_INCLUDE$ac_delim
 QT_DIR!$QT_DIR$ac_delim
 PBX_QT!$PBX_QT$ac_delim
@@ -34448,7 +34554,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` = 96; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --git a/configure.ac b/configure.ac
index 8f1d95c0dd574538dcd635b39cefa10ff02a980b..cc065c60527e674759028150b1a70b890e1ad22d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,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)

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index d5a6faa1bd220c00c19dbd21d5ce2206516401e1..3e015f133c3c9738f93d5b1110b5a5ec7c432cb9 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -323,6 +323,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 to indicate the ${SPEEX_DESCRIP} library */
 #undef HAVE_SPEEX