Add --disable-alisp configure option

Added --disable-alisp configure option to disable alsip support.

diff --git a/Makefile.am b/Makefile.am
index 4ab838cd880488363d1b9a025639604773f1a1e8..d6779060708d0051d3bf931e72c56f4a3f3ceab1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,10 @@ if BUILD_PCM_PLUGIN_SHM
 SUBDIRS += aserver
 endif
 if BUILD_MIXER
+if BUILD_ALISP
 SUBDIRS += alsalisp
 endif
+endif
 SUBDIRS += test utils
 EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure hgcompile libtool depcomp version MEMORY-LEAK
 AUTOMAKE_OPTIONS=foreign

diff --git a/configure.in b/configure.in
index 197ffb3e0e8bc92f6e5b8855513b75bb933c4136..d860ef7585c8bdb00c723c71b2d788575fb91a43 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -239,6 +239,9 @@ AC_ARG_ENABLE(seq,
 AC_ARG_ENABLE(instr,
   [  --disable-instr     Disable the instrument component],
   [build_instr="$enableval"], [build_instr="yes"])
+AC_ARG_ENABLE(alisp,
+  [  --disable-alisp     Disable the alisp component],
+  [build_alisp="$enableval"], [build_alisp="yes"])
 
 if test "$build_seq" != "yes"; then
   build_instr="no"
@@ -250,6 +253,7 @@ AM_CONDITIONAL(BUILD_RAWMIDI, test x$build_rawmidi = xyes)
 AM_CONDITIONAL(BUILD_HWDEP, test x$build_hwdep = xyes)
 AM_CONDITIONAL(BUILD_SEQ, test x$build_seq = xyes)
 AM_CONDITIONAL(BUILD_INSTR, test x$build_instr = xyes)
+AM_CONDITIONAL(BUILD_ALISP, test x$build_alisp = xyes)
 
 if test "$build_mixer" = "yes"; then
   AC_DEFINE([BUILD_MIXER], "1", [Build mixer component])

diff --git a/src/Makefile.am b/src/Makefile.am
index f7cc81df2c79f00cc6cc5616b5263bae59882c6d..138de68b7e83cc36c4dbae70dbc3d9a6b6f14b06 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,8 +36,12 @@ if BUILD_INSTR
 SUBDIRS += instr
 libasound_la_LIBADD += instr/libinstr.la
 endif
-SUBDIRS += compat conf alisp
-libasound_la_LIBADD += compat/libcompat.la alisp/libalisp.la -lm -ldl -lpthread
+if BUILD_ALISP
+SUBDIRS += alisp
+libasound_la_LIBADD += alisp/libalisp.la endif
+endif
+SUBDIRS += compat conf
+libasound_la_LIBADD += compat/libcompat.la -lm -ldl -lpthread
 
 libasound_la_LDFLAGS = -version-info $(COMPATNUM)
 AM_LDFLAGS = $(VSYMS)

diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am
index ab812f93c765017eee510ef87f9482b86767bd9c..e1dd3b594d58a332a3249b9250a37c63e2bacd0a 100644 (file)
--- a/src/conf/Makefile.am
+++ b/src/conf/Makefile.am
@@ -1,7 +1,9 @@
 SUBDIRS=cards pcm
 
-cfg_files = alsa.conf \
-       sndo-mixer.alisp
+cfg_files = alsa.conf
+if BUILD_ALISP
+cfg_files += sndo-mixer.alisp
+endif
 
 EXTRA_DIST = $(cfg_files)
 

diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
index 39930b96a4a5167157f53021ec01408c9b536953..4e5d3f4b63594115e3705ae04f23c9d4b5c4f656 100644 (file)
--- a/src/conf/cards/Makefile.am
+++ b/src/conf/cards/Makefile.am
@@ -46,17 +46,23 @@ cfg_files = aliases.conf \
        VIA8237.conf \
        VX222.conf \
        VXPocket.conf \
-       VXPocket440.conf \
-\
-       aliases.alisp
+       VXPocket440.conf
+
+if BUILD_ALISP
+cfg_files += aliases.alisp
+endif
 
 alsa_DATA = $(cfg_files)
 
+if BUILD_ALISP
 SI7018dir = $(datadir)/alsa/cards/SI7018
 SI7018_files = \
        SI7018/sndoc-mixer.alisp \
        SI7018/sndop-mixer.alisp
 SI7018_DATA = $(SI7018_files)
+else
+SI7018_files=
+endif
 
 EXTRA_DIST = \
        $(cfg_files) \