* #29743 modified config.h of libsnd, UI adjustements
diff --git a/jni/libsndfile-1.0.25/config.log b/jni/libsndfile-1.0.25/config.log
index fe2b906..129b854 100644
--- a/jni/libsndfile-1.0.25/config.log
+++ b/jni/libsndfile-1.0.25/config.log
@@ -4,7 +4,7 @@
It was created by libsndfile configure 1.0.25, which was
generated by GNU Autoconf 2.68. Invocation command line was
- $ ./configure --disable-external-libs --disable-alsa
+ $ ./configure --disable-external-libs
## --------- ##
## Platform. ##
@@ -48,7 +48,6 @@
PATH: /home/lisional/Dev/ADT/sdk/platform-tools
PATH: /home/lisional/Dev/ADT/ndk
PATH: /home/lisional/.local/bin
-PATH: /home/lisional/Dev/ADT/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/
## ----------- ##
@@ -1176,9 +1175,19 @@
| }
|
configure:18739: result: none
+configure:18816: checking alsa/asoundlib.h usability
+configure:18816: gcc -c -g -O2 conftest.c >&5
+configure:18816: $? = 0
+configure:18816: result: yes
+configure:18816: checking alsa/asoundlib.h presence
+configure:18816: gcc -E conftest.c
+configure:18816: $? = 0
+configure:18816: result: yes
+configure:18816: checking for alsa/asoundlib.h
+configure:18816: result: yes
configure:18838: checking sndio.h usability
configure:18838: gcc -c -g -O2 conftest.c >&5
-conftest.c:123:19: fatal error: sndio.h: No such file or directory
+conftest.c:124:19: fatal error: sndio.h: No such file or directory
compilation terminated.
configure:18838: $? = 1
configure: failed program was:
@@ -1270,6 +1279,7 @@
| #define OS_IS_WIN32 0
| #define OS_IS_MACOSX 0
| #define USE_WINDOWS_API 0
+| #define HAVE_ALSA_ASOUNDLIB_H 1
| /* end confdefs.h. */
| #include <stdio.h>
| #ifdef HAVE_SYS_TYPES_H
@@ -1308,7 +1318,7 @@
configure:18838: result: no
configure:18838: checking sndio.h presence
configure:18838: gcc -E conftest.c
-conftest.c:90:19: fatal error: sndio.h: No such file or directory
+conftest.c:91:19: fatal error: sndio.h: No such file or directory
compilation terminated.
configure:18838: $? = 1
configure: failed program was:
@@ -1400,6 +1410,7 @@
| #define OS_IS_WIN32 0
| #define OS_IS_MACOSX 0
| #define USE_WINDOWS_API 0
+| #define HAVE_ALSA_ASOUNDLIB_H 1
| /* end confdefs.h. */
| #include <sndio.h>
configure:18838: result: no
@@ -1449,28 +1460,28 @@
on pcal
-config.status:1358: creating src/Makefile
-config.status:1358: creating man/Makefile
-config.status:1358: creating examples/Makefile
-config.status:1358: creating tests/Makefile
-config.status:1358: creating regtest/Makefile
-config.status:1358: creating M4/Makefile
-config.status:1358: creating doc/Makefile
-config.status:1358: creating Win32/Makefile
-config.status:1358: creating Octave/Makefile
-config.status:1358: creating programs/Makefile
-config.status:1358: creating Makefile
-config.status:1358: creating src/version-metadata.rc
-config.status:1358: creating tests/test_wrapper.sh
-config.status:1358: creating tests/pedantic-header-test.sh
-config.status:1358: creating doc/libsndfile.css
-config.status:1358: creating build-test-tarball.mk
-config.status:1358: creating libsndfile.spec
-config.status:1358: creating sndfile.pc
-config.status:1358: creating src/sndfile.h
-config.status:1358: creating src/config.h
-config.status:1587: executing depfiles commands
-config.status:1587: executing libtool commands
+config.status:1359: creating src/Makefile
+config.status:1359: creating man/Makefile
+config.status:1359: creating examples/Makefile
+config.status:1359: creating tests/Makefile
+config.status:1359: creating regtest/Makefile
+config.status:1359: creating M4/Makefile
+config.status:1359: creating doc/Makefile
+config.status:1359: creating Win32/Makefile
+config.status:1359: creating Octave/Makefile
+config.status:1359: creating programs/Makefile
+config.status:1359: creating Makefile
+config.status:1359: creating src/version-metadata.rc
+config.status:1359: creating tests/test_wrapper.sh
+config.status:1359: creating tests/pedantic-header-test.sh
+config.status:1359: creating doc/libsndfile.css
+config.status:1359: creating build-test-tarball.mk
+config.status:1359: creating libsndfile.spec
+config.status:1359: creating sndfile.pc
+config.status:1359: creating src/sndfile.h
+config.status:1359: creating src/config.h
+config.status:1588: executing depfiles commands
+config.status:1588: executing libtool commands
configure:22287: result:
-=-=-=-=-=-=-=-=-=-= Configuration Complete =-=-=-=-=-=-=-=-=-=-
@@ -1483,7 +1494,7 @@
Host OS : ............................. linux-gnu
Experimental code : ................... no
- Using ALSA in example programs : ...... no
+ Using ALSA in example programs : ...... yes
External FLAC/Ogg/Vorbis : ............ no
configure:22341: result:
@@ -1596,6 +1607,7 @@
ac_cv_func_waitpid=yes
ac_cv_func_write=yes
ac_cv_have_decl_S_IRGRP=yes
+ac_cv_header_alsa_asoundlib_h=yes
ac_cv_header_byteswap_h=yes
ac_cv_header_dlfcn_h=yes
ac_cv_header_endian_h=yes
@@ -1701,7 +1713,7 @@
ACLOCAL='${SHELL} /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Cfg/missing --run aclocal-1.11'
ACLOCAL_AMFLAGS='-I M4'
-ALSA_LIBS=''
+ALSA_LIBS='-lasound'
AMDEPBACKSLASH='\'
AMDEP_FALSE='#'
AMDEP_TRUE=''
@@ -1976,6 +1988,7 @@
#define OS_IS_WIN32 0
#define OS_IS_MACOSX 0
#define USE_WINDOWS_API 0
+#define HAVE_ALSA_ASOUNDLIB_H 1
#define WIN32_TARGET_DLL 0
#define COMPILER_IS_GCC 1