From 24a7b2fec2fdac87aa3594daa2b3ed979dd45706 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 7 May 2014 09:19:36 +0200 Subject: [PATCH] configure: add --with-lock-dir option Signed-off-by: Jaroslav Kysela --- alsactl/Makefile.am | 13 ++++++++++--- configure.in | 6 ++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index b05b09c..5ec3b80 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -7,9 +7,16 @@ man_MANS += alsactl_init.7 endif EXTRA_DIST=alsactl.1 alsactl_init.xml -alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c monitor.c -alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" -noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c +alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c \ + monitor.c + +alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU \ + -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" \ + -DSYS_LOCKPATH=\"$(ASOUND_LOCK_DIR)\" \ + -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" + +noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c \ + init_utils_run.c init_sysfs.c udevrules_DATA = \ 90-alsa-restore.rules diff --git a/configure.in b/configure.in index 60da1fa..e310ee1 100644 --- a/configure.in +++ b/configure.in @@ -330,6 +330,12 @@ AC_ARG_WITH([asound-state-dir], [ASOUND_STATE_DIR="/var/lib/alsa"]) AC_SUBST(ASOUND_STATE_DIR) +AC_ARG_WITH([alsactl-lock-dir], + AS_HELP_STRING([--with-alsactl-lock-dir=DIR], [Directory to place lock files in]), + [ASOUND_LOCK_DIR="$withval"], + [ASOUND_LOCK_DIR="/var/lock"]) +AC_SUBST(ASOUND_LOCK_DIR) + AC_ARG_WITH([alsactl-pidfile-dir], AS_HELP_STRING([--with-alsactl-pidfile-dir=DIR], [Directory to place alsactl.pid file in]), [ALSACTL_PIDFILE_DIR="$withval"],