diff --git a/configure.ac b/configure.ac index 6af70b4..7919729 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ AC_INIT([audioreach-conf],1.0.0) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) # defines some macros variable to be included by source AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIRS([m4]) +AR_PATHS # Checks for programs. AC_PROG_CC diff --git a/linux/reference/Makefile.am b/linux/reference/Makefile.am index 25e514c..763a04c 100644 --- a/linux/reference/Makefile.am +++ b/linux/reference/Makefile.am @@ -7,12 +7,12 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) if HAVE_LIBALSA diff --git a/m4/audioreach-paths.m4 b/m4/audioreach-paths.m4 new file mode 100644 index 0000000..eda3cbc --- /dev/null +++ b/m4/audioreach-paths.m4 @@ -0,0 +1,46 @@ +# audioreach-paths.m4 -- shared installation paths for AudioReach +# serial 1 +# +# SPDX-License-Identifier: BSD-3-Clause +# +# Usage, in configure.ac: +# +# AC_CONFIG_MACRO_DIRS([m4]) +# AR_PATHS +# +# Provides three directories, as configure options and as make variables: +# +# audioreachconfdir integrator-editable configuration +# audioreachdatadir read-only vendor data +# audioreachdeltadir runtime-writable ACDB deltas +# +# Do not AC_DEFINE these. ${sysconfdir} is unexpanded at configure time, so +# AC_DEFINE would put a literal "${prefix}" into config.h. Pass them to the +# compiler from Makefile.am instead, where make expands them: +# +# AM_CFLAGS += -DCARD_DEF_FILE=\"$(audioreachconfdir)/card-defs.xml\" + +AC_DEFUN([AR_PATHS], [ + + AC_ARG_WITH([audioreach-confdir], + [AS_HELP_STRING([--with-audioreach-confdir=DIR], + [AudioReach configuration directory @<:@SYSCONFDIR/audioreach@:>@])], + [audioreachconfdir="$withval"], + [audioreachconfdir='${sysconfdir}/audioreach']) + + AC_ARG_WITH([audioreach-datadir], + [AS_HELP_STRING([--with-audioreach-datadir=DIR], + [AudioReach read-only data directory @<:@DATADIR/audioreach@:>@])], + [audioreachdatadir="$withval"], + [audioreachdatadir='${datadir}/audioreach']) + + AC_ARG_WITH([audioreach-deltadir], + [AS_HELP_STRING([--with-audioreach-deltadir=DIR], + [AudioReach ACDB delta directory @<:@LOCALSTATEDIR/lib/audioreach/acdb-delta@:>@])], + [audioreachdeltadir="$withval"], + [audioreachdeltadir='${localstatedir}/lib/audioreach/acdb-delta']) + + AC_SUBST([audioreachconfdir]) + AC_SUBST([audioreachdatadir]) + AC_SUBST([audioreachdeltadir]) +]) diff --git a/nxp/reference/Makefile.am b/nxp/reference/Makefile.am index 827eb97..81a4716 100644 --- a/nxp/reference/Makefile.am +++ b/nxp/reference/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/GLYMUR/Makefile.am b/qcom/qli/GLYMUR/Makefile.am index 57f70cd..f59d06f 100644 --- a/qcom/qli/GLYMUR/Makefile.am +++ b/qcom/qli/GLYMUR/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/GLYMUR/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/GLYMUR/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/Kaanapali/Makefile.am b/qcom/qli/Kaanapali/Makefile.am index e58f452..00c8e7d 100644 --- a/qcom/qli/Kaanapali/Makefile.am +++ b/qcom/qli/Kaanapali/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/Kaanapali/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/Kaanapali/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/MAHUA/Makefile.am b/qcom/qli/MAHUA/Makefile.am index 596127f..e5586b8 100644 --- a/qcom/qli/MAHUA/Makefile.am +++ b/qcom/qli/MAHUA/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/MAHUA/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/MAHUA/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/X1E80100/Makefile.am b/qcom/qli/X1E80100/Makefile.am index 79fe460..42ae9c4 100644 --- a/qcom/qli/X1E80100/Makefile.am +++ b/qcom/qli/X1E80100/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/X1E80100/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/X1E80100/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/configure.ac b/qcom/qli/configure.ac index 70a709d..cb9b771 100644 --- a/qcom/qli/configure.ac +++ b/qcom/qli/configure.ac @@ -11,6 +11,8 @@ AC_INIT([audioreach-conf],1.0.0) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) # defines some macros variable to be included by source AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIRS([m4]) +AR_PATHS # Checks for programs. AC_PROG_CC diff --git a/qcom/qli/m4/audioreach-paths.m4 b/qcom/qli/m4/audioreach-paths.m4 new file mode 100644 index 0000000..eda3cbc --- /dev/null +++ b/qcom/qli/m4/audioreach-paths.m4 @@ -0,0 +1,46 @@ +# audioreach-paths.m4 -- shared installation paths for AudioReach +# serial 1 +# +# SPDX-License-Identifier: BSD-3-Clause +# +# Usage, in configure.ac: +# +# AC_CONFIG_MACRO_DIRS([m4]) +# AR_PATHS +# +# Provides three directories, as configure options and as make variables: +# +# audioreachconfdir integrator-editable configuration +# audioreachdatadir read-only vendor data +# audioreachdeltadir runtime-writable ACDB deltas +# +# Do not AC_DEFINE these. ${sysconfdir} is unexpanded at configure time, so +# AC_DEFINE would put a literal "${prefix}" into config.h. Pass them to the +# compiler from Makefile.am instead, where make expands them: +# +# AM_CFLAGS += -DCARD_DEF_FILE=\"$(audioreachconfdir)/card-defs.xml\" + +AC_DEFUN([AR_PATHS], [ + + AC_ARG_WITH([audioreach-confdir], + [AS_HELP_STRING([--with-audioreach-confdir=DIR], + [AudioReach configuration directory @<:@SYSCONFDIR/audioreach@:>@])], + [audioreachconfdir="$withval"], + [audioreachconfdir='${sysconfdir}/audioreach']) + + AC_ARG_WITH([audioreach-datadir], + [AS_HELP_STRING([--with-audioreach-datadir=DIR], + [AudioReach read-only data directory @<:@DATADIR/audioreach@:>@])], + [audioreachdatadir="$withval"], + [audioreachdatadir='${datadir}/audioreach']) + + AC_ARG_WITH([audioreach-deltadir], + [AS_HELP_STRING([--with-audioreach-deltadir=DIR], + [AudioReach ACDB delta directory @<:@LOCALSTATEDIR/lib/audioreach/acdb-delta@:>@])], + [audioreachdeltadir="$withval"], + [audioreachdeltadir='${localstatedir}/lib/audioreach/acdb-delta']) + + AC_SUBST([audioreachconfdir]) + AC_SUBST([audioreachdatadir]) + AC_SUBST([audioreachdeltadir]) +]) diff --git a/qcom/qli/qcm6490/Makefile.am b/qcom/qli/qcm6490/Makefile.am index e0ebc31..6433f99 100644 --- a/qcom/qli/qcm6490/Makefile.am +++ b/qcom/qli/qcm6490/Makefile.am @@ -7,13 +7,13 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/QCS6490_RB3Gen2/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/QCS6490_RB3Gen2/ config_acdbdata_DATA = $(config_acdbdata) -config_acdbdata_idpdir = $(sysconfdir)/acdbdata/QCM6490_IDP/ +config_acdbdata_idpdir = $(audioreachdatadir)/acdbdata/QCM6490_IDP/ config_acdbdata_idp_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs615/Makefile.am b/qcom/qli/qcs615/Makefile.am index 4d73ad6..60db21d 100644 --- a/qcom/qli/qcs615/Makefile.am +++ b/qcom/qli/qcs615/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/TALOS_EVK/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/TALOS_EVK/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs8275/Makefile.am b/qcom/qli/qcs8275/Makefile.am index 87e7f22..d4e13ca 100644 --- a/qcom/qli/qcs8275/Makefile.am +++ b/qcom/qli/qcs8275/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/MONACO_EVK/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/MONACO_EVK/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs8300/Makefile.am b/qcom/qli/qcs8300/Makefile.am index 70db981..d81b0ae 100644 --- a/qcom/qli/qcs8300/Makefile.am +++ b/qcom/qli/qcs8300/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/qcs8300/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/qcs8300/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs9075/Makefile.am b/qcom/qli/qcs9075/Makefile.am index 735ee05..93931dd 100644 --- a/qcom/qli/qcs9075/Makefile.am +++ b/qcom/qli/qcs9075/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/LEMANS_EVK/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/LEMANS_EVK/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs9100/Makefile.am b/qcom/qli/qcs9100/Makefile.am index fa35744..68076fd 100644 --- a/qcom/qli/qcs9100/Makefile.am +++ b/qcom/qli/qcs9100/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/qcs9100/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/qcs9100/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/shikra_cqs/Makefile.am b/qcom/qli/shikra_cqs/Makefile.am index c3513d1..dcea694 100644 --- a/qcom/qli/shikra_cqs/Makefile.am +++ b/qcom/qli/shikra_cqs/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/shikra_cqs_evk/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/shikra_cqs_evk/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/shikra_iqs/Makefile.am b/qcom/qli/shikra_iqs/Makefile.am index 0bf013c..ccadde9 100644 --- a/qcom/qli/shikra_iqs/Makefile.am +++ b/qcom/qli/shikra_iqs/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/shikra_iqs_evk/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/shikra_iqs_evk/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/sm8750/Makefile.am b/qcom/qli/sm8750/Makefile.am index e7e4542..eeff8b1 100644 --- a/qcom/qli/sm8750/Makefile.am +++ b/qcom/qli/sm8750/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/SM8750_MTP/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/SM8750_MTP/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef)