Use $sysconfdir as prefix for ALSA_LCONF_DIR by default. Otherwise install fails on non-FHS distros.

Signed-off-by: Alex Ivanov gnidorah@ya.ru --- configure.ac | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac index 5b80585..7b8dd66 100644 --- a/configure.ac +++ b/configure.ac @@ -219,6 +219,23 @@ AC_DEFINE_UNQUOTED(ALSA_DATA_DIR, "$alsadatadir", [directory containing ALSA dat ALSA_DATA_DIR="$alsadatadir" AC_SUBST(ALSA_DATA_DIR)

+dnl ALSA configuration directory +AC_ARG_WITH(alsaconfdir, + AS_HELP_STRING([--with-alsaconfdir=dir], + [path where ALSA configuration files are stored]), + alsaconfdir="$withval", alsaconfdir="") +if test -z "$alsaconfdir"; then + eval dir="$sysconfdir" + case "$dir" in + /*) ;; + *) dir="$dir" + esac + alsaconfdir="$dir/alsa" +fi +AC_DEFINE_UNQUOTED(ALSA_CONF_DIR, "$alsaconfdir", [directory containing ALSA configuration files]) +ALSA_CONF_DIR="$alsaconfdir" +AC_SUBST(ALSA_CONF_DIR) + dnl ALSA add-on global config directory AC_ARG_WITH(alsagconfdir, AS_HELP_STRING([--with-alsagconfdir=dir], @@ -237,7 +254,7 @@ AC_ARG_WITH(alsalconfdir, [path where ALSA local add-on config files are stored]), alsalconfdir="$withval", alsalconfdir="") if test -z "$alsalconfdir"; then - alsalconfdir="/etc/alsa/conf.d" + alsalconfdir="$ALSA_CONF_DIR/conf.d" fi AC_DEFINE_UNQUOTED(ALSA_LCONF_DIR, "$alsalconfdir", [directory containing local ALSA add-on config files]) ALSA_LCONF_DIR="$alsalconfdir"