Merge "Binaural synthesis (confbridge): Adds binaural synthesis to bridge_softmix."

1 files changed, 29 insertions, 11 deletions

diff --git a/configure b/configure
index 0c2d84ee1..893f10738 100755
--- a/configure
+++ b/configure
@@ -29441,7 +29441,7 @@ if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfftw3 ${pbxlibdir} -lfftw3 $LIBS"
+LIBS="-lfftw3 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -29483,7 +29483,7 @@ fi
 
    # now check for the header.
    if test "${AST_FFTW3_FOUND}" = "yes"; then
-      FFTW3_LIB="${pbxlibdir} -lfftw3 -lfftw3"
+      FFTW3_LIB="${pbxlibdir} -lfftw3 "
       # if --with-FFTW3=DIR has been specified, use it.
       if test "x${FFTW3_DIR}" != "x"; then
          FFTW3_INCLUDE="-I${FFTW3_DIR}/include"
@@ -29521,11 +29521,6 @@ _ACEOF
 fi
 
 
-if test "$PBX_FFTW3" = "1"; then
-
-$as_echo "#define HAVE_FFTW 1" >>confdefs.h
-
-fi
 
 if test "x${PBX_SNDFILE}" != "x1" -a "${USE_SNDFILE}" != "no"; then
    pbxlibdir=""
@@ -29550,7 +29545,7 @@ if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsndfile ${pbxlibdir} -lsndfile $LIBS"
+LIBS="-lsndfile ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -29592,7 +29587,7 @@ fi
 
    # now check for the header.
    if test "${AST_SNDFILE_FOUND}" = "yes"; then
-      SNDFILE_LIB="${pbxlibdir} -lsndfile -lsndfile"
+      SNDFILE_LIB="${pbxlibdir} -lsndfile "
       # if --with-SNDFILE=DIR has been specified, use it.
       if test "x${SNDFILE_DIR}" != "x"; then
          SNDFILE_INCLUDE="-I${SNDFILE_DIR}/include"
@@ -29632,8 +29627,6 @@ fi
 
 
 
-
-
     if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
         if test "xminimum version of SpanDSP" != "x"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5
@@ -36275,6 +36268,31 @@ else
 	touch makeopts.acbak
 fi
 
+# conf_bridge (binaural rendering): check if HRIRs are available
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bridges/bridge_softmix/include/hrirs.h" >&5
+$as_echo_n "checking for bridges/bridge_softmix/include/hrirs.h... " >&6; }
+if ${ac_cv_file_bridges_bridge_softmix_include_hrirs_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "bridges/bridge_softmix/include/hrirs.h"; then
+  ac_cv_file_bridges_bridge_softmix_include_hrirs_h=yes
+else
+  ac_cv_file_bridges_bridge_softmix_include_hrirs_h=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_bridges_bridge_softmix_include_hrirs_h" >&5
+$as_echo "$ac_cv_file_bridges_bridge_softmix_include_hrirs_h" >&6; }
+if test "x$ac_cv_file_bridges_bridge_softmix_include_hrirs_h" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_BRIDGES_BRIDGE_SOFTMIX_INCLUDE_HRIRS_H 1
+_ACEOF
+
+fi
+
+
 ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts"