From c2f1ffdf2a821fded692d340d2f639b3a25b1cc8 Mon Sep 17 00:00:00 2001 From: yuchpan Date: Mon, 11 May 2026 20:59:14 +0800 Subject: [PATCH] agm: improve configuration flexibility and usability Update the build configuration, including the use of USE_GLIB and USE_G_STR_FUNC to control glib usage, USE_SYSLOG for syslog, and CUTILS_SUPPORTED for cutils. Add support for configuring period_size and n_periods parameters in agmplay. Signed-off-by: Aditya Rathi --- configure.ac | 26 ++++++++++++++++------ ipc/DBus/agm_client/Makefile.am | 19 ++++++++++++----- ipc/DBus/agm_server/Makefile.am | 20 ++++++++++++++--- ipc/SwBinders/agm_client/Makefile.am | 13 ++++++----- ipc/SwBinders/agm_server/Makefile.am | 23 ++++++++++++++------ plugins/alsalib/Makefile.am | 8 ++++++- plugins/tinyalsa/Makefile.am | 14 +++++++++++- plugins/tinyalsa/test/Makefile.am | 13 ++++++++--- plugins/tinyalsa/test/agmcap.c | 9 ++++---- plugins/tinyalsa/test/agmplay.c | 32 +++++++++++++++++++--------- service/Makefile.am | 8 ++++++- service/src/agm.c | 2 ++ snd_parser/Makefile.am | 2 +- 13 files changed, 143 insertions(+), 46 deletions(-) diff --git a/configure.ac b/configure.ac index ce5cf59f..a3a21918 100644 --- a/configure.ac +++ b/configure.ac @@ -41,9 +41,12 @@ AC_ARG_WITH([use_default_acdb_path], [with_use_default_acdb_path=no]) AM_CONDITIONAL([USE_DEFAULT_ACDB_PATH], [test "x${with_use_default_acdb_path}" = "xyes"]) -AC_ARG_WITH([glib], - AC_HELP_STRING([--with-glib], - [enable glib, Build against glib. Use this when building for HLOS systems which use glib])) +AC_ARG_WITH([card-def-native], + AS_HELP_STRING([--with-card-def-native=PATH], + [path to native card-defs xml (default /etc/card-defs-native.xml)]), + [card_def_native=$withval], + [card_def_native="/etc/card-defs-native.xml"]) +AC_SUBST([CARD_DEF_FILE_NATIVE], [$card_def_native]) # Optional ALSALIB build support AC_ARG_ENABLE([alsalib], @@ -52,6 +55,16 @@ AC_ARG_ENABLE([alsalib], [enable_alsalib=no]) AM_CONDITIONAL([BUILD_ALSALIB], [test "x$enable_alsalib" = "xyes"]) +AC_ARG_WITH([cutils], + AS_HELP_STRING([Use cutils (default is no)]), + [with_cutils=$withval], + [with_cutils=no]) +AM_CONDITIONAL([CUTILS_SUPPORTED], [test "x${with_cutils}" = "xyes"]) + +AC_ARG_WITH([glib], + AC_HELP_STRING([--with-glib], + [enable glib, Build against glib. Use this when building for HLOS systems which use glib])) + if (test "x${with_glib}" = "xyes"); then PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes, AC_MSG_ERROR(GThread >= 2.16 is required)) @@ -66,6 +79,10 @@ fi AM_CONDITIONAL(USE_GLIB, test "x${with_glib}" = "xyes") +AC_CHECK_FUNCS([strlcpy]) +AM_CONDITIONAL(USE_G_STR_FUNC, + [test "x${with_glib}" = "xyes" && ! test "x$ac_cv_func_strlcpy" = "xyes"]) + AC_ARG_WITH([no_ipc], AS_HELP_STRING([--with-no-ipc],[disable ipc communication to AGM (default is no)]), [with_no_ipc=$withval], @@ -105,9 +122,6 @@ AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) fi -AC_CHECK_FUNCS([strlcpy]) -AM_CONDITIONAL(USE_G_STR_FUNC, ! test "x$ac_cv_func_strlcpy" = "xyes") - AC_CONFIG_FILES( Makefile service/Makefile diff --git a/ipc/DBus/agm_client/Makefile.am b/ipc/DBus/agm_client/Makefile.am index 08086b11..d2aa969c 100644 --- a/ipc/DBus/agm_client/Makefile.am +++ b/ipc/DBus/agm_client/Makefile.am @@ -1,11 +1,20 @@ lib_LTLIBRARIES = libagmclient.la -libagmclient_la_CPPFLAGS = -I $(top_srcdir)/service/inc/public -DAGM_USE_SYSLOG +libagmclient_la_CPPFLAGS = -I $(top_srcdir)/service/inc/public libagmclient_la_CPPFLAGS += -I $(top_srcdir)/service/inc/public/agm +libagmclient_ladir = $(libdir) +libagmclient_la_LDFLAGS = -ldl -lrt -shared -version-number @LT_VERSION_NUMBER@ +libagmclient_la_SOURCES = src/agm_client_wrapper_dbus.cpp +libagmclient_la_LIBADD = + +if USE_SYSLOG +libagmclient_la_CPPFLAGS += -DAGM_USE_SYSLOG +endif + +if USE_GLIB libagmclient_la_CPPFLAGS += $(GLIB_CFLAGS) +libagmclient_la_LIBADD += $(GLIB_LIBS) -lgobject-2.0 -lgio-2.0 +endif + if USE_G_STR_FUNC libagmclient_la_CPPFLAGS += -Dstrlcpy=g_strlcpy -Dstrlcat=g_strlcat endif -libagmclient_ladir = $(libdir) -libagmclient_la_LDFLAGS = -ldl -lrt -shared -version-number @LT_VERSION_NUMBER@ -libagmclient_la_SOURCES = src/agm_client_wrapper_dbus.cpp -libagmclient_la_LDFLAGS += $(GLIB_LIBS) -lgobject-2.0 -lgio-2.0 diff --git a/ipc/DBus/agm_server/Makefile.am b/ipc/DBus/agm_server/Makefile.am index 62a6ea40..466f0ec1 100644 --- a/ipc/DBus/agm_server/Makefile.am +++ b/ipc/DBus/agm_server/Makefile.am @@ -11,13 +11,27 @@ AM_CPPFLAGS += -D__unused=__attribute__\(\(__unused__\)\) lib_LTLIBRARIES = libagmserverwrapper.la libagmserverwrapper_la_SOURCES = ./src/agm-dbus-utils.cpp ./src/agm_server_wrapper_dbus.cpp -libagmserverwrapper_la_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) -DAGM_USE_SYSLOG +libagmserverwrapper_la_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) libagmserverwrapper_la_LIBADD = -lagm -L$(top_builddir)/service/.libs libagmserverwrapper_la_LDFLAGS = -ldl -lpthread -lar-osal -shared -avoid-version $(DBUS_LIBS) bin_PROGRAMS = agm_server agm_server_SOURCES = ./src/agm-server-daemon.cpp -agm_server_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) -DAGM_USE_SYSLOG -Wno-write-strings -agm_server_LDADD = libagmserverwrapper.la $(GLIB_LIBS) +agm_server_CPPFLAGS = $(AM_CPPFLAGS) -Wno-write-strings +agm_server_LDADD = libagmserverwrapper.la agm_server_LDFLAGS = -ldl -shared -avoid-version + +if USE_G_STR_FUNC +AM_CPPFLAGS += -Dstrlcpy=g_strlcpy -Dstrlcat=g_strlcat +endif + +if USE_SYSLOG +AM_CPPFLAGS += -DAGM_USE_SYSLOG +endif + +if USE_GLIB +AM_CPPFLAGS += $(GLIB_CFLAGS) +libagmserverwrapper_la_LIBADD += $(GLIB_LIBS) +agm_server_LDADD += $(GLIB_LIBS) +endif diff --git a/ipc/SwBinders/agm_client/Makefile.am b/ipc/SwBinders/agm_client/Makefile.am index 075ca7f4..02c11f81 100644 --- a/ipc/SwBinders/agm_client/Makefile.am +++ b/ipc/SwBinders/agm_client/Makefile.am @@ -1,12 +1,15 @@ - AM_CPPFLAGS = -I $(srcdir) \ - -I $(PKG_CONFIG_SYSROOT_DIR)/usr/include/agm/ \ - -I $(top_srcdir)/ipc/SwBinders/agm_server/inc/ \ - -I $(top_srcdir)/service/inc/public/ + -I $(PKG_CONFIG_SYSROOT_DIR)/usr/include/agm/ \ + -I $(top_srcdir)/ipc/SwBinders/agm_server/inc/ \ + -I $(top_srcdir)/service/inc/public/ AM_CPPFLAGS += -DDYNAMIC_LOG_ENABLED lib_LTLIBRARIES = libagmclientwrapper.la libagmclientwrapper_ladir = $(libdir) libagmclientwrapper_la_SOURCES = src/agm_client_wrapper.cpp libagmclientwrapper_la_CPPFLAGS = $(AM_CPPFLAGS) -libagmclientwrapper_la_LDFLAGS = -lcutils -llog -ldl -lbinder -shared -avoid-version -lutils -lrt +libagmclientwrapper_la_LDFLAGS = -ldl -lbinder -shared -avoid-version -lutils -lrt libagmclientwrapper_la_LIBADD = -L$(top_builddir)/ipc/SwBinders/agm_server/.libs -lagmproxy -laudio_log_utils + +if CUTILS_SUPPORTED +libagmclientwrapper_la_LIBADD += -lcutils -llog +endif diff --git a/ipc/SwBinders/agm_server/Makefile.am b/ipc/SwBinders/agm_server/Makefile.am index 8147fb6a..9c6f9ebf 100644 --- a/ipc/SwBinders/agm_server/Makefile.am +++ b/ipc/SwBinders/agm_server/Makefile.am @@ -17,21 +17,32 @@ library_include_HEADERS = $(h_sources) library_includedir = $(includedir)/qti-agm-service/ lib_LTLIBRARIES = libagmserverwrapper.la -libagmserverwrapper_la_SOURCES = ${srcdir}/src/agm_death_notifier.cpp ${srcdir}/src/agm_server_wrapper.cpp ${srcdir}/src/agm_callback.cpp +libagmserverwrapper_la_SOURCES = ${srcdir}/src/agm_death_notifier.cpp ${srcdir}/src/agm_server_wrapper.cpp ${srcdir}/src/agm_callback.cpp libagmserverwrapper_la_CPPFLAGS = $(AM_CPPFLAGS) -libagmserverwrapper_la_LDFLAGS = -lcutils -llog -ldl -lbinder -shared -avoid-version -lutils -lpthread +libagmserverwrapper_la_LDFLAGS = -ldl -lbinder -shared -avoid-version -lutils -lpthread lib_LTLIBRARIES += libagmproxy.la -libagmproxy_la_SOURCES = ${srcdir}/src/ipc_proxy_server.cpp +libagmproxy_la_SOURCES = ${srcdir}/src/ipc_proxy_server.cpp libagmproxy_la_CPPFLAGS = $(AM_CPPFLAGS) libagmproxy_la_LIBADD = libagmserverwrapper.la -libagmproxy_la_LDFLAGS = -lcutils -llog -ldl -lbinder -shared -avoid-version -lutils -lpthread +libagmproxy_la_LDFLAGS = -ldl -lbinder -shared -avoid-version -lutils -lpthread bin_PROGRAMS = agm_server agm_server_SOURCES = ${srcdir}/src/agm_server_daemon.cpp agm_server_CPPFLAGS = $(AM_CPPFLAGS) -agm_server_LDADD = libagmproxy.la -laudio_log_utils +agm_server_LDADD = libagmproxy.la -laudio_log_utils libagmserverwrapper_la_LIBADD = -L$(top_builddir)/service/.libs -lagm -laudio_log_utils -agm_server_LDFLAGS = -lcutils -llog -ldl -lbinder -shared -avoid-version -lutils +agm_server_LDFLAGS = -ldl -lbinder -shared -avoid-version -lutils + +if CUTILS_SUPPORTED +AM_CPPFLAGS += -DAGM_USE_CUTILS +libagmserverwrapper_la_LIBADD += -lcutils -llog +libagmproxy_la_LIBADD += -lcutils -llog +agm_server_LDADD += -lcutils -llog +endif + +if USE_SYSLOG +AM_CPPFLAGS += -DAGM_USE_SYSLOG +endif diff --git a/plugins/alsalib/Makefile.am b/plugins/alsalib/Makefile.am index e301afc3..24ccb4f1 100644 --- a/plugins/alsalib/Makefile.am +++ b/plugins/alsalib/Makefile.am @@ -7,7 +7,9 @@ library_includedir = $(includedir) AM_CFLAGS = -Wno-unused-parameter AM_CFLAGS += -I $(top_srcdir)/include -I $(PKG_CONFIG_SYSROOT_DIR)/usr/include AM_CFLAGS += -I $(top_srcdir)/service/inc/public -I $(top_srcdir)/snd_parser/inc +if USE_GLIB AM_CFLAGS += $(GLIB_CFLAGS) +endif AM_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\) -D__LINUX__ AM_CFLAGS += -I $(top_srcdir)/../../snd_parser/inc @@ -19,7 +21,6 @@ if USE_G_STR_FUNC AM_CFLAGS += -Dstrlcpy=g_strlcpy -Dstrlcat=g_strlcat endif - if BUILD_ALSALIB alsaplugindir = $(libdir)/alsa-lib @@ -54,4 +55,9 @@ libasound_module_ctl_agm_la_LDFLAGS += -L$(top_builddir)/ipc/DBus/agm_client/.li libasound_module_ctl_agm_la_LIBADD = -lasound -lsndcardparser -lagmclient endif +if USE_GLIB +libasound_module_pcm_agm_la_LIBADD += $(GLIB_LIBS) +libasound_module_ctl_agm_la_LIBADD += $(GLIB_LIBS) +endif + endif diff --git a/plugins/tinyalsa/Makefile.am b/plugins/tinyalsa/Makefile.am index a01279ff..1a258ceb 100644 --- a/plugins/tinyalsa/Makefile.am +++ b/plugins/tinyalsa/Makefile.am @@ -6,11 +6,19 @@ library_includedir = $(includedir) AM_CFLAGS = -Wno-unused-parameter AM_CFLAGS += -I $(top_srcdir)/service/inc/public -I $(top_srcdir)/snd_parser/inc + +if USE_GLIB AM_CFLAGS += $(GLIB_CFLAGS) -include glib.h +endif + if USE_G_STR_FUNC AM_CFLAGS += -Dstrlcpy=g_strlcpy -Dstrlcat=g_strlcat endif + +if USE_SYSLOG AM_CFLAGS += -DAGM_USE_SYSLOG +endif + if !MEMLOGGER_SUPPORTED AM_CFLAGS += @KVH2XML_CFLAGS@ endif @@ -57,7 +65,7 @@ libagm_mixer_plugin_la_SOURCES = src/agm_mixer_plugin.c libagm_mixer_plugin_la_CFLAGS = $(AM_CFLAGS) libagm_mixer_plugin_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\) libagm_mixer_plugin_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@ -L$(top_builddir)/snd_parser/.libs -libagm_mixer_plugin_la_LIBADD = -ltinyalsa -lsndcardparser $(GLIB_LIBS) +libagm_mixer_plugin_la_LIBADD = -ltinyalsa -lsndcardparser if AGM_NO_IPC libagm_mixer_plugin_la_CFLAGS += -DAGM_NO_IPC libagm_mixer_plugin_la_LDFLAGS += -L$(top_builddir)/service/.libs @@ -72,3 +80,7 @@ endif if AGM_IPC_SWBINDER libagm_mixer_plugin_la_LIBADD += -L$(top_builddir)/ipc/SwBinders/agm_client/.libs/ -lagmclientwrapper endif + +if USE_GLIB +libagm_mixer_plugin_la_LIBADD += $(GLIB_LIBS) +endif diff --git a/plugins/tinyalsa/test/Makefile.am b/plugins/tinyalsa/test/Makefile.am index cf29d8af..096784e0 100644 --- a/plugins/tinyalsa/test/Makefile.am +++ b/plugins/tinyalsa/test/Makefile.am @@ -4,7 +4,10 @@ EXTRA_DIST = $(pkgconfig_DATA) AM_CFLAGS = -Wno-unused-parameter -Wno-unused-result AM_CFLAGS += -I$(top_srcdir)/service/inc/public -AM_CFLAGS += $(GLIB_CFLAGS) -include glib.h @KVH2XML_CFLAGS@ +if USE_GLIB +AM_CFLAGS += $(GLIB_CFLAGS) -include glib.h +endif +AM_CFLAGS += @KVH2XML_CFLAGS@ if USE_G_STR_FUNC AM_CFLAGS += -Dstrlcpy=g_strlcpy -Dstrlcat=g_strlcat @@ -15,7 +18,11 @@ lib_LTLIBRARIES = libagmmixer.la libagmmixer_la_SOURCES = agmmixer.c libagmmixer_la_CFLAGS = $(AM_CFLAGS) libagmmixer_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@ -libagmmixer_la_LIBADD = -ltinyalsa -ldl -lexpat @GLIB_LIBS@ +libagmmixer_la_LIBADD = -ltinyalsa -ldl -lexpat + +if USE_GLIB +libagmmixer_la_LIBADD += @GLIB_LIBS@ +endif bin_PROGRAMS = agmplay agmplay_SOURCES = agmplay.c @@ -33,4 +40,4 @@ agmcap_LDADD = -ltinyalsa libagmmixer.la root_etcdir = "/etc" root_etc_SCRIPTS = backend_conf.xml install-data-hook: - chmod go-x $(DESTDIR)$(root_etcdir)/backend_conf.xml + chmod go-x $(DESTDIR)$(root_etcdir)/backend_conf.xml diff --git a/plugins/tinyalsa/test/agmcap.c b/plugins/tinyalsa/test/agmcap.c index 20ce9d67..3cf6028b 100644 --- a/plugins/tinyalsa/test/agmcap.c +++ b/plugins/tinyalsa/test/agmcap.c @@ -80,9 +80,9 @@ static void sigint_handler(int sig) capturing = 0; } -static void usage(char *progname) +static void usage(const char *progname) { - printf(" Usage: file.wav in /data [-help print usage] [-D card] [-d device]\n" + printf(" Usage: %s file.wav in /data [-help print usage] [-D card] [-d device]\n" " [-c channels] [-r rate] [-b bits] [-p period_size]\n" " [-n n_periods] [-T capture time] [-i intf_name] [-dkv device_kv]\n" " [-dppkv deviceppkv] : Assign 0 if no device pp in the graph\n" @@ -98,6 +98,7 @@ int main(int argc, char **argv) { FILE *file; struct wav_header header; + const char *progname = argv[0]; unsigned int card = 100; unsigned int device = 101; unsigned int usb_device = 1; @@ -120,7 +121,7 @@ int main(int argc, char **argv) bool is_24_LE = false; if (argc < 2) { - usage(argv[0]); + usage(progname); return 1; } @@ -208,7 +209,7 @@ int main(int argc, char **argv) if (*argv) usb_device = atoi(*argv); }else if (strcmp(*argv, "-help") == 0) { - usage(argv[0]); + usage(progname); } if (*argv) argv++; diff --git a/plugins/tinyalsa/test/agmplay.c b/plugins/tinyalsa/test/agmplay.c index 9e8bff8f..c04af299 100644 --- a/plugins/tinyalsa/test/agmplay.c +++ b/plugins/tinyalsa/test/agmplay.c @@ -74,7 +74,7 @@ void play_sample(FILE *file, unsigned int card, unsigned int device, unsigned in unsigned int channels, unsigned int rate, unsigned int bits, unsigned int *device_kv, unsigned int stream_kv, unsigned int instance_kv, unsigned int *devicepp_kv, struct chunk_fmt fmt, bool haptics, char **intf_name, - int intf_num, bool is_24_LE); + int intf_num, bool is_24_LE, unsigned int period_size, unsigned int period_count); void stream_close(int sig) { @@ -83,10 +83,10 @@ void stream_close(int sig) close = 1; } -static void usage(char *progname) +static void usage(const char *progname) { - printf(" Usage: file.wav in /data [-help print usage] [-D card] [-d device]\n" - " [-c channels] [-r rate] [-b bits]\n" + printf(" Usage: %s file.wav [-help print usage] [-D card] [-d device]\n" + " [-c channels] [-r rate] [-b bits] [-p period_size] [-n n_periods]\n" " [-num_intf num of interfaces followed by interface name]\n" " [-i intf_name] : Can be multiple if num_intf is more than 1\n" " [-dkv device_kv] : Can be multiple if num_intf is more than 1\n" @@ -105,11 +105,14 @@ int main(int argc, char **argv) struct riff_wave_header riff_wave_header; struct chunk_header chunk_header; struct chunk_fmt chunk_fmt; + const char *progname = argv[0]; unsigned int card = 100, device = 100, i=0; unsigned int usb_device = 1; unsigned int channels = 2; unsigned int rate = 48000; unsigned int bits = 16; + unsigned int period_size = 1024; + unsigned int period_count = 4; int intf_num = 1; uint32_t dkv = SPEAKER; uint32_t dppkv = DEVICEPP_RX_AUDIO_MBDRC; @@ -129,7 +132,7 @@ int main(int argc, char **argv) } if (argc < 3) { - usage(argv[0]); + usage(progname); return 1; } @@ -207,6 +210,14 @@ int main(int argc, char **argv) argv++; if (*argv) card = atoi(*argv); + } else if (strcmp(*argv, "-p") == 0) { + argv++; + if (*argv) + period_size = atoi(*argv); + } else if (strcmp(*argv, "-n") == 0) { + argv++; + if (*argv) + period_count = atoi(*argv); } else if (strcmp(*argv, "-num_intf") == 0) { argv++; if (*argv) @@ -273,7 +284,7 @@ int main(int argc, char **argv) if (*argv) usb_device = atoi(*argv); } else if (strcmp(*argv, "-help") == 0) { - usage(argv[0]); + usage(progname); } if (*argv) argv++; @@ -283,7 +294,8 @@ int main(int argc, char **argv) return 1; play_sample(file, card, device, usb_device, channels, rate, bits, device_kv, stream_kv, - instance_kv, devicepp_kv, chunk_fmt, haptics, intf_name, intf_num, is_24_LE); + instance_kv, devicepp_kv, chunk_fmt, haptics, intf_name, intf_num, is_24_LE, + period_size, period_count); fclose(file); if (device_kv) @@ -300,7 +312,7 @@ void play_sample(FILE *file, unsigned int card, unsigned int device, unsigned in unsigned int channels, unsigned int rate, unsigned int bits, unsigned int *device_kv, unsigned int stream_kv, unsigned int instance_kv, unsigned int *devicepp_kv, struct chunk_fmt fmt, bool haptics, char **intf_name, - int intf_num, bool is_24_LE) + int intf_num, bool is_24_LE, unsigned int period_size, unsigned int period_count) { struct pcm_config config; struct pcm *pcm; @@ -336,8 +348,8 @@ void play_sample(FILE *file, unsigned int card, unsigned int device, unsigned in memset(&config, 0, sizeof(config)); config.channels = fmt.num_channels; config.rate = fmt.sample_rate; - config.period_size = 1024; - config.period_count = 4; + config.period_size = period_size; + config.period_count = period_count; if (fmt.bits_per_sample == 32) { if (is_24_LE) config.format = PCM_FORMAT_S24_LE; diff --git a/service/Makefile.am b/service/Makefile.am index 6a34ab10..d4f9b28f 100644 --- a/service/Makefile.am +++ b/service/Makefile.am @@ -44,9 +44,15 @@ if USE_DEFAULT_ACDB_PATH libagm_la_CFLAGS += -DUSE_DEFAULT_ACDB_PATH endif +if CUTILS_SUPPORTED +libagm_la_LIBADD += -lcutils -llog +AM_CFLAGS += -DAGM_USE_CUTILS +endif + if USE_SYSLOG libagm_la_CFLAGS += -DAGM_USE_SYSLOG endif + if MEMLOGGER_SUPPORTED libagm_la_LIBADD += -laudio_log_utils -larmemlog else @@ -54,7 +60,7 @@ libagm_la_CFLAGS += -DAGM_MEMLOG_UNSUPPORTED endif if USE_GLIB -libagm_la_LIBADD += -lglib-2.0 +libagm_la_LIBADD += $(GLIB_LIBS) libagm_la_CFLAGS += $(GLIB_CFLAGS) -include glib.h endif diff --git a/service/src/agm.c b/service/src/agm.c index 8acbb256..954873eb 100644 --- a/service/src/agm.c +++ b/service/src/agm.c @@ -37,6 +37,8 @@ #include #ifndef AGM_MEMLOG_UNSUPPORTED #include +#else +#include "gsl_intf.h" #endif #include "ats.h" #include diff --git a/snd_parser/Makefile.am b/snd_parser/Makefile.am index 419d59c2..e9cff26e 100644 --- a/snd_parser/Makefile.am +++ b/snd_parser/Makefile.am @@ -12,7 +12,7 @@ lib_includedir = $(includedir)/sndparser/ AM_CFLAGS = -I $(srcdir)/inc -I $(top_srcdir)/service/inc/public AM_CFLAGS += -Wno-unused-parameter AM_CFLAGS += -DCARD_DEF_FILE=\"/etc/card-defs.xml\" -AM_CFLAGS += -DCARD_DEF_FILE_NATIVE=\"/etc/card-defs-native.xml\" +AM_CFLAGS += -DCARD_DEF_FILE_NATIVE=\"@CARD_DEF_FILE_NATIVE@\" AM_CFLAGS += -Wl,-z,defs lib_LTLIBRARIES = libsndcardparser.la