diff --git a/configure.ac b/configure.ac
index e3d1bc0..ffa5f8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,8 @@
 AM_CONDITIONAL([SPLIT_A2DP], [test x$AUDIO_FEATURE_ENABLED_SPLIT_A2DP = xtrue])
 AM_CONDITIONAL([QAF_SUPPORT], [test x$AUDIO_FEATURE_ENABLED_QAF = xtrue])
 AM_CONDITIONAL([AUDIO_HW_LOOPBACK], [test x$AUDIO_FEATURE_ENABLED_AUDIO_HW_LOOPBACK = xtrue])
+AM_CONDITIONAL([AUDIO_PARSER], [test x$AUDIO_FEATURE_ENABLED_PARSER = xtrue])
+AM_CONDITIONAL([DTSHD_PARSER], [test x$AUDIO_FEATURE_ENABLED_DTSHD_PARSER = xtrue])
 
 AC_CONFIG_FILES([ \
         Makefile \
diff --git a/hal/Makefile.am b/hal/Makefile.am
index 2c811f6..1d60f2d 100644
--- a/hal/Makefile.am
+++ b/hal/Makefile.am
@@ -134,6 +134,13 @@
 c_sources += audio_extn/passthru.c
 endif
 
+if AUDIO_PARSER
+AM_CFLAGS += -I ${WORKSPACE}/audio/mm-audio/audio-parsers/inc/
+if DTSHD_PARSER
+AM_CFLAGS += -DDTSHD_PARSER_ENABLED
+endif
+endif
+
 if KEEP_ALIVE
 AM_CFLAGS += -DKEEP_ALIVE_ENABLED
 c_sources += audio_extn/keep_alive.c
@@ -194,6 +201,9 @@
 audio_primary_default_la_SOURCES = $(c_sources)
 audio_primary_default_la_LIBADD = $(GLIB_LIBS) -llog -lcutils -ltinyalsa
 audio_primary_default_la_LIBADD += -ltinycompress -laudioroute -ldl -lexpat -laudioutils
+if AUDIO_PARSER
+audio_primary_default_la_LIBADD += -laudioparsers
+endif
 audio_primary_default_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
 audio_primary_default_la_CFLAGS += -Dstrlcat=g_strlcat
 audio_primary_default_la_CFLAGS += -DINT_MAX=0x7fffffff