From 9f9ae68a9d7443917f6ec36afb01dcd83dc91f38 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 23 Sep 2008 08:10:19 +0200 Subject: [PATCH] Add --disable-alsaconf to configure script Signed-off-by: Jaroslav Kysela --- Makefile.am | 8 +++++++- configure.in | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index b2646e4..554617d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,13 @@ ALSAMIXER_DIR=alsamixer else ALSAMIXER_DIR= endif -SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po +if ALSACONF +ALSACONF_DIR=alsaconf +else +ALSACONF_DIR= +endif +SUBDIRS= include alsactl $(ALSACONF_DIR) $(ALSAMIXER_DIR) amidi amixer \ + aplay iecset seq speaker-test utils m4 po EXTRA_DIST= TODO gitcompile AUTOMAKE_OPTIONS=foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.in b/configure.in index 5b77fbb..1c95e10 100644 --- a/configure.in +++ b/configure.in @@ -29,6 +29,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AM_PATH_ALSA(1.0.16) +dnl Disable alsamixer CURSESINC="" CURSESLIB="" CURSES_CFLAGS="" @@ -41,6 +42,16 @@ AC_ARG_ENABLE(alsamixer, esac],[alsamixer=true]) AM_CONDITIONAL(ALSAMIXER, test x$alsamixer = xtrue) +dnl Disable alsaconf +AC_ARG_ENABLE(alsaconf, + [ --disable-alsaconf Disable alsaconf packaging], + [case "${enableval}" in + yes) alsaconf=true ;; + no) alsaconf=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-alsaconf) ;; + esac],[alsaconf=true]) +AM_CONDITIONAL(ALSACONF, test x$alsaconf = xtrue) + dnl Checks for header files. AC_HEADER_STDC if test x$alsamixer = xtrue; then