OSDN Git Service

conf: add snd_config_merge() function
[android-x86/external-alsa-lib.git] / configure.ac
index 6533e3f..515048a 100644 (file)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(alsa-lib, 1.1.7)
+AC_INIT(alsa-lib, 1.2.5pre1)
 
 AC_CONFIG_SRCDIR([src/control/control.c])
 AC_CONFIG_MACRO_DIR([m4])
@@ -423,7 +423,10 @@ if test "$build_python" = "yes" -a "$build_mixer_pymodules" = "yes"; then
   pythonlibs0=
   pythoninc0=
   if test "$build_python2" != "yes"; then
-    pythonlibs0=$(python3-config --libs)
+    pythonlibs0=$(python3-config --libs --embed 2> /dev/null)
+    if test -z "$pythonlibs0"; then
+      pythonlibs0=$(python3-config --libs)
+    fi
     pythoninc0=$(python3-config --includes)
   fi
   if test -z "$pythonlibs0"; then
@@ -513,6 +516,13 @@ if test -z "$gcc_have_atomics"; then
 fi
 AC_MSG_RESULT($gcc_have_atomics)
 
+dnl check mmx register for pcm_dmix_i386
+
+AC_TRY_LINK([],
+    [__asm__ volatile ("" : : : "mm0");],
+    [AC_DEFINE([HAVE_MMX], "1", [MMX technology is enabled])],
+    [])
+
 PCM_PLUGIN_LIST="copy linear route mulaw alaw adpcm rate plug multi shm file null empty share meter hooks lfloat ladspa dmix dshare dsnoop asym iec958 softvol extplug ioplug mmap_emul"
 
 build_pcm_plugin="no"
@@ -619,6 +629,19 @@ if test "$build_pcm_mmap_emul" = "yes"; then
   AC_DEFINE([BUILD_PCM_PLUGIN_MMAP_EMUL], "1", [Build PCM mmap-emul plugin])
 fi
 
+if test "$build_pcm_dmix" = "yes"; then
+AC_MSG_CHECKING(for default lockless dmix)
+AC_ARG_ENABLE(lockless-dmix,
+  AS_HELP_STRING([--enable-lockless-dmix],
+    [use lockless dmix as default on x86]),
+  lockless_dmix="$enableval", lockless_dmix="no")
+if test "$lockless_dmix" = "yes"; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE([LOCKLESS_DMIX_DEFAULT], "1", [Lockless dmix as default])
+else
+  AC_MSG_RESULT(no)
+fi
+fi
 
 dnl Create PCM plugin symbol list for static library
 rm -f "$srcdir"/src/pcm/pcm_symbols_list.c
@@ -636,7 +659,7 @@ AC_ARG_WITH(ctl-plugins,
     [build control plugins (default = all)]),
   [ctl_plugins="$withval"], [ctl_plugins="all"])
 
-CTL_PLUGIN_LIST="shm ext"
+CTL_PLUGIN_LIST="remap shm ext"
 
 build_ctl_plugin="no"
 for t in $CTL_PLUGIN_LIST; do
@@ -658,6 +681,7 @@ if test "$ac_cv_header_sys_shm_h" != "yes"; then
 fi
 
 AM_CONDITIONAL([BUILD_CTL_PLUGIN], [test x$build_ctl_plugin = xyes])
+AM_CONDITIONAL([BUILD_CTL_PLUGIN_REMAP], [test x$build_ctl_remap = xyes])
 AM_CONDITIONAL([BUILD_CTL_PLUGIN_SHM], [test x$build_ctl_shm = xyes])
 AM_CONDITIONAL([BUILD_CTL_PLUGIN_EXT], [test x$build_ctl_ext = xyes])
 
@@ -707,7 +731,8 @@ if test ! -L "$srcdir"/include/alsa ; then
 fi
 
 AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
-         include/Makefile include/sound/Makefile src/Versions src/Makefile \
+         include/Makefile include/sound/Makefile include/sound/uapi/Makefile \
+         src/Versions src/Makefile \
           src/control/Makefile src/mixer/Makefile \
          src/pcm/Makefile src/pcm/scopes/Makefile \
          src/rawmidi/Makefile src/timer/Makefile \
@@ -716,61 +741,10 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
          src/conf/Makefile \
          src/conf/cards/Makefile \
          src/conf/pcm/Makefile \
-         src/conf/ucm/Makefile \
-         src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/Makefile \
-         src/conf/ucm/broadwell-rt286/Makefile \
-         src/conf/ucm/broxton-rt298/Makefile \
-         src/conf/ucm/bytcr-rt5640/Makefile \
-         src/conf/ucm/bytcr-rt5640-mono-spk-dmic1-mic/Makefile \
-         src/conf/ucm/bytcr-rt5640-mono-spk-in1-mic/Makefile \
-         src/conf/ucm/bytcr-rt5640-mono-spk-in3-mic/Makefile \
-         src/conf/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/Makefile \
-         src/conf/ucm/bytcr-rt5640-stereo-spk-in1-mic/Makefile \
-         src/conf/ucm/bytcr-rt5640-stereo-spk-in3-mic/Makefile \
-         src/conf/ucm/bytcr-rt5651/Makefile \
-         src/conf/ucm/bytcr-rt5651-mono-spk-in1-mic/Makefile \
-         src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic/Makefile \
-         src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/Makefile \
-         src/conf/ucm/bytcr-rt5651-stereo-spk-in1-mic/Makefile \
-         src/conf/ucm/bytcr-rt5651-stereo-spk-in2-mic/Makefile \
-         src/conf/ucm/bytcr-rt5651-stereo-spk-in12-mic/Makefile \
-         src/conf/ucm/chtnau8824/Makefile \
-         src/conf/ucm/chtrt5645/Makefile \
-         src/conf/ucm/chtrt5645-mono-speaker-analog-mic/Makefile \
-         src/conf/ucm/chtrt5650/Makefile \
-         src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/Makefile \
-         src/conf/ucm/DAISY-I2S/Makefile \
-         src/conf/ucm/DB410c/Makefile \
-         src/conf/ucm/Dell-WD15-Dock/Makefile \
-         src/conf/ucm/GoogleNyan/Makefile \
-         src/conf/ucm/gpd-win-pocket-rt5645/Makefile \
-         src/conf/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/Makefile \
-         src/conf/ucm/HDAudio-Lenovo-DualCodecs/Makefile \
-         src/conf/ucm/kblrt5660/Makefile \
-         src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/Makefile \
-         src/conf/ucm/PandaBoard/Makefile \
-         src/conf/ucm/PandaBoardES/Makefile \
-         src/conf/ucm/PAZ00/Makefile \
-         src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/Makefile \
-         src/conf/ucm/SDP4430/Makefile \
-         src/conf/ucm/skylake-rt286/Makefile \
-         src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/Makefile \
-         src/conf/ucm/tegraalc5632/Makefile \
-         src/conf/ucm/VEYRON-I2S/Makefile \
-         src/conf/ucm/codecs/Makefile \
-         src/conf/ucm/codecs/nau8824/Makefile \
-         src/conf/ucm/codecs/rt5640/Makefile \
-         src/conf/ucm/codecs/rt5651/Makefile \
-         src/conf/ucm/platforms/Makefile \
-         src/conf/ucm/platforms/bytcr/Makefile \
-         src/conf/topology/Makefile \
-         src/conf/topology/broadwell/Makefile \
          modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \
-         src/conf/topology/sklrt286/Makefile \
-         src/conf/topology/bxtrt298/Makefile \
          alsalisp/Makefile aserver/Makefile \
          test/Makefile test/lsb/Makefile \
-         utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
+         utils/Makefile utils/alsa-lib.spec utils/alsa.pc utils/alsa-topology.pc)
 
 dnl Create asoundlib.h dynamically according to configure options
 echo "Creating asoundlib.h..."
@@ -815,4 +789,3 @@ test "$build_seq" = "yes" && echo "#include <alsa/seq.h>" >> include/asoundlib.h
 test "$build_seq" = "yes" && echo "#include <alsa/seqmid.h>" >> include/asoundlib.h
 test "$build_seq" = "yes" && echo "#include <alsa/seq_midi_event.h>" >> include/asoundlib.h
 cat "$srcdir"/include/asoundlib-tail.h >> include/asoundlib.h
-