Add plugin directory configure option

Added --with-plugindir configure option to specify the directory
for plugin objects.

diff --git a/a52/Makefile.am b/a52/Makefile.am
index 4021496d40397d47ce168fa8f72a3201de009651..ea0078f9acc2302fa3922f8a197d17a8c3610eb4 100644 (file)
--- a/a52/Makefile.am
+++ b/a52/Makefile.am
@@ -1,6 +1,6 @@
 asound_module_pcm_a52_LTLIBRARIES = libasound_module_pcm_a52.la
 
-asound_module_pcm_a52dir = $(libdir)/alsa-lib
+asound_module_pcm_a52dir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@
 AM_LDFLAGS = -module -avoid-version -export-dynamic

diff --git a/configure.in b/configure.in
index 1e606da1fbe74289d24227d08c07cea966d3b316..88484b18cdb8dfada6526db67e3f4954be6ab5f2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,25 @@ AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes)
 CFLAGS="$CFLAGS_saved"
 LDFLAGS="$LDFLAGS_saved"
 
+dnl ALSA plugin directory
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+
+AC_ARG_WITH(plugindir,
+    AS_HELP_STRING([--with-plugindir=dir],
+       [path where ALSA plugin files are stored]),
+    plugindir="$withval", plugindir="")
+if test -z "$plugindir"; then
+    eval dir="$libdir"
+    case "$dir" in
+    /*) ;;
+    *) dir="$dir"
+    esac
+    plugindir="$dir/alsa-lib"
+fi
+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
+ALSA_PLUGIN_DIR="$plugindir"
+AC_SUBST(ALSA_PLUGIN_DIR)
+
 SAVE_PLUGINS_VERSION
 
 AC_OUTPUT([

diff --git a/jack/Makefile.am b/jack/Makefile.am
index 6b5ddb0e8bf57a2cea27cf076e98df96da6eaecc..d7de5fdb19740165479061642454fdfba8f8f5e5 100644 (file)
--- a/jack/Makefile.am
+++ b/jack/Makefile.am
@@ -1,6 +1,6 @@
 asound_module_pcm_jack_LTLIBRARIES = libasound_module_pcm_jack.la
 
-asound_module_pcm_jackdir = $(libdir)/alsa-lib
+asound_module_pcm_jackdir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @JACK_CFLAGS@
 AM_LDFLAGS = -module -avoid-version -export-dynamic

diff --git a/maemo/Makefile.am b/maemo/Makefile.am
index 3a7f47628c5c6c49fd9d0b7782e507f3fd7df034..fb59bce042e0a9b3f16308ca1b829e83860f23c6 100644 (file)
--- a/maemo/Makefile.am
+++ b/maemo/Makefile.am
@@ -1,8 +1,8 @@
 asound_module_pcm_alsa_dsp_LTLIBRARIES = libasound_module_pcm_alsa_dsp.la
 asound_module_ctl_dsp_ctl_LTLIBRARIES = libasound_module_ctl_dsp_ctl.la
 
-asound_module_pcm_alsa_dspdir = $(libdir)/alsa-lib
-asound_module_ctl_dsp_ctldir = $(libdir)/alsa-lib
+asound_module_pcm_alsa_dspdir = @ALSA_PLUGIN_DIR@
+asound_module_ctl_dsp_ctldir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -Wall -fPIC -DPIC -O2 @ALSA_CFLAGS@ $(DBUS_CFLAGS)
 AM_LDFLAGS = -shared -lm -ldl -lpthread -module -avoid-version -export-dynamic $(DBUS_LIBS)

diff --git a/mix/Makefile.am b/mix/Makefile.am
index c830043672a118fecffcb962a1e8b18b2625ee84..a9d3756dd55acd5ba667e6eacba3efc1318dcacc 100644 (file)
--- a/mix/Makefile.am
+++ b/mix/Makefile.am
@@ -1,8 +1,8 @@
 asound_module_pcm_upmix_LTLIBRARIES = libasound_module_pcm_upmix.la
 asound_module_pcm_vdownmix_LTLIBRARIES = libasound_module_pcm_vdownmix.la
 
-asound_module_pcm_upmixdir = $(libdir)/alsa-lib
-asound_module_pcm_vdownmixdir = $(libdir)/alsa-lib
+asound_module_pcm_upmixdir = @ALSA_PLUGIN_DIR@
+asound_module_pcm_vdownmixdir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -Wall -g @ALSA_CFLAGS@
 AM_LDFLAGS = -module -avoid-version -export-dynamic

diff --git a/oss/Makefile.am b/oss/Makefile.am
index 84223bcbaecb7f7e6d5a4f4fbf4d6322f9ef4080..c02ecb97981bceab3568837d1ec9ea3d811cc8e3 100644 (file)
--- a/oss/Makefile.am
+++ b/oss/Makefile.am
@@ -1,8 +1,8 @@
 asound_module_pcm_oss_LTLIBRARIES = libasound_module_pcm_oss.la
 asound_module_ctl_oss_LTLIBRARIES = libasound_module_ctl_oss.la
 
-asound_module_pcm_ossdir = $(libdir)/alsa-lib
-asound_module_ctl_ossdir = $(libdir)/alsa-lib
+asound_module_pcm_ossdir = @ALSA_PLUGIN_DIR@
+asound_module_ctl_ossdir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -Wall -g @ALSA_CFLAGS@
 AM_LDFLAGS = -module -avoid-version -export-dynamic

diff --git a/pph/Makefile.am b/pph/Makefile.am
index 0a9808a3f957ff38b68a20a57c18f96d46fc3634..8fd5098119272eb948623e053efc3fd537c36528 100644 (file)
--- a/pph/Makefile.am
+++ b/pph/Makefile.am
@@ -1,6 +1,6 @@
 asound_module_rate_speexrate_LTLIBRARIES = libasound_module_rate_speexrate.la
 
-asound_module_rate_speexratedir = $(libdir)/alsa-lib
+asound_module_rate_speexratedir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -DVAR_ARRAYS -DRANDOM_PREFIX=alsa_lib -DOUTSIDE_SPEEX -Wall -g @ALSA_CFLAGS@
 AM_LDFLAGS = -module -avoid-version -export-dynamic
@@ -9,11 +9,11 @@ libasound_module_rate_speexrate_la_SOURCES = rate_speexrate.c resample.c
 libasound_module_rate_speexrate_la_LIBADD = @ALSA_LIBS@
 
 install-exec-hook:
-       rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_*.so
-       $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_best.so
-       $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_medium.so
+       rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_*.so
+       $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_best.so
+       $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_medium.so
 
 uninstall-hook:
-       rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_*.so
+       rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_*.so
 
 noinst_HEADERS = speex_resampler.h arch.h fixed_generic.h

diff --git a/pulse/Makefile.am b/pulse/Makefile.am
index 3da25f0e63ebf1f7a4af8ef0a58881c612062c74..13e18e54e38eae4480a20425c00866f1f4eaf659 100644 (file)
--- a/pulse/Makefile.am
+++ b/pulse/Makefile.am
@@ -1,8 +1,8 @@
 asound_module_pcm_LTLIBRARIES = libasound_module_pcm_pulse.la
 asound_module_ctl_LTLIBRARIES = libasound_module_ctl_pulse.la
 
-asound_module_pcmdir = $(libdir)/alsa-lib
-asound_module_ctldir = $(libdir)/alsa-lib
+asound_module_pcmdir = @ALSA_PLUGIN_DIR@
+asound_module_ctldir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE
 AM_LDFLAGS = -module -avoid-version -export-dynamic

diff --git a/rate-lavc/Makefile.am b/rate-lavc/Makefile.am
index ab6f0cbbe49d6dbc7d66fce6c4ca05ed9ecdc4f6..88f4596dc7b42321990bc84f902a7c3d8233bd32 100644 (file)
--- a/rate-lavc/Makefile.am
+++ b/rate-lavc/Makefile.am
@@ -1,6 +1,6 @@
 asound_module_rate_lavcrate_LTLIBRARIES = libasound_module_rate_lavcrate.la
 
-asound_module_rate_lavcratedir = $(libdir)/alsa-lib
+asound_module_rate_lavcratedir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@
 AM_LDFLAGS = -module -avoid-version -export-dynamic
@@ -11,11 +11,11 @@ libasound_module_rate_lavcrate_la_LIBADD = @ALSA_LIBS@ @AVCODEC_LIBS@
 noinst_HEADERS = gcd.h
 
 install-exec-hook:
-       rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_*.so
-       $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_higher.so
-       $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_high.so
-       $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_fast.so
-       $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_faster.so
+       rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_*.so
+       $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_higher.so
+       $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_high.so
+       $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_fast.so
+       $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_faster.so
 
 uninstall-hook:
-       rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_*.so
+       rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_*.so

diff --git a/rate/Makefile.am b/rate/Makefile.am
index 7b63f0291312d891f5df7fc6013bf3aa22690c5e..97e479d3f848b336df3636e35e608f7c7ccfb38d 100644 (file)
--- a/rate/Makefile.am
+++ b/rate/Makefile.am
@@ -1,6 +1,6 @@
 asound_module_rate_samplerate_LTLIBRARIES = libasound_module_rate_samplerate.la
 
-asound_module_rate_sampleratedir = $(libdir)/alsa-lib
+asound_module_rate_sampleratedir = @ALSA_PLUGIN_DIR@
 
 AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(samplerate_CFLAGS)
 AM_LDFLAGS = -module -avoid-version -export-dynamic
@@ -9,11 +9,11 @@ libasound_module_rate_samplerate_la_SOURCES = rate_samplerate.c
 libasound_module_rate_samplerate_la_LIBADD = @ALSA_LIBS@ @samplerate_LIBS@
 
 install-exec-hook:
-       rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_*.so
-       $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_best.so
-       $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_medium.so
-       $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_order.so
-       $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_linear.so
+       rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_*.so
+       $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_best.so
+       $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_medium.so
+       $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_order.so
+       $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_linear.so
 
 uninstall-hook:
        rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_*.so