From 612216db0d09528e5526f83296513d7a8e01f488 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 6 Sep 2006 14:39:01 +0200 Subject: [PATCH] Add --disable-alisp configure option Added --disable-alisp configure option to disable alsip support. --- Makefile.am | 2 ++ configure.in | 4 ++++ src/Makefile.am | 8 ++++++-- src/conf/Makefile.am | 6 ++++-- src/conf/cards/Makefile.am | 12 +++++++++--- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4ab838cd..d6779060 100644 --- 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 197ffb3e..d860ef75 100644 --- 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 f7cc81df..138de68b 100644 --- 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 ab812f93..e1dd3b59 100644 --- 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 39930b96..4e5d3f4b 100644 --- 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) \ -- 2.47.1