From 773f723f87fbfa0dead1ad1148fdec796c2d011b Mon Sep 17 00:00:00 2001
From: Jaska Uimonen <jaska.uimonen@helsinki.fi>
Date: Tue, 29 Oct 2013 10:27:39 +0200
Subject: [PATCH] make samsung policy optional behind configure flag

Change-Id: I81d85dbf9faa0d3e1a28f46dfed86e7956c311a3
Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
---
 configure.ac    | 20 +++++++++++++++++---
 src/Makefile.am | 25 ++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index f9b0cec..06d0a91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -635,9 +635,23 @@ PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ], [],
 
 PKG_CHECK_MODULES(LIBSNDFILE, [ sndfile >= 1.0.20 ])
 
-PKG_CHECK_MODULES(VCONF, vconf)
-AC_SUBST(VCONF_CFLAGS)
-AC_SUBST(VCONF_LIBS)
+dnl use samsung policy module --------------------------------------------------------
+AC_ARG_ENABLE(samsung-policy, AC_HELP_STRING([--enable-samsung-policy], [using samsung-policy]),
+[
+ case "${enableval}" in
+	 yes) USE_SAMSUNG_POLICY=yes ;;
+	 no)  USE_SAMSUNG_POLICY=no ;;
+	 *)   AC_MSG_ERROR(bad value ${enableval} for --enable-samsung_policy) ;;
+ esac
+ ],[USE_SAMSUNG_POLICY=no])
+
+if test "x$USE_SAMSUNG_POLICY" = "xyes"; then
+	PKG_CHECK_MODULES(VCONF, vconf)
+	AC_SUBST(VCONF_CFLAGS)
+	AC_SUBST(VCONF_LIBS)
+fi
+AM_CONDITIONAL(USE_SAMSUNG_POLICY, test "x$USE_SAMSUNG_POLICY" = "xyes")
+dnl end --------------------------------------------------------------------
 
 dnl use dlog --------------------------------------------------------------------------
 AC_ARG_ENABLE(dlog, AC_HELP_STRING([--enable-dlog], [using dlog]),
diff --git a/src/Makefile.am b/src/Makefile.am
index 3663cde..4d841d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -757,7 +757,6 @@ pulseinclude_HEADERS = \
 		pulse/ext-stream-restore.h \
 		pulse/ext-node-manager.h \
 		pulse/ext-echo-cancel.h \
-		pulse/ext-policy.h \
 		pulse/format.h \
 		pulse/gccmacro.h \
 		pulse/introspect.h \
@@ -781,6 +780,11 @@ pulseinclude_HEADERS = \
 		pulse/volume.h \
 		pulse/xmalloc.h
 
+if USE_SAMSUNG_POLICY
+pulseinclude_HEADERS += \
+		pulse/ext-policy.h
+endif
+
 lib_LTLIBRARIES = \
 		libpulse.la \
 		libpulse-simple.la
@@ -805,7 +809,6 @@ libpulse_la_SOURCES = \
 		pulse/ext-stream-restore.c pulse/ext-stream-restore.h \
 		pulse/ext-node-manager.c pulse/ext-node-manager.h \
 		pulse/ext-echo-cancel.c pulse/ext-echo-cancel.h \
-		pulse/ext-policy.c pulse/ext-policy.h \
 		pulse/format.c pulse/format.h \
 		pulse/gccmacro.h \
 		pulse/internal.h \
@@ -828,6 +831,11 @@ libpulse_la_SOURCES = \
 		pulse/volume.c pulse/volume.h \
 		pulse/xmalloc.c pulse/xmalloc.h
 
+if USE_SAMSUNG_POLICY
+libpulse_la_SOURCES += \
+        pulse/ext-policy.c pulse/ext-policy.h
+endif
+
 libpulse_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(LIBJSON_CFLAGS)
 libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBJSON_LIBS) libpulsecommon-@PA_MAJORMINOR@.la
 libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
@@ -1081,9 +1089,12 @@ libavahi_wrap_la_LIBADD = $(AM_LIBADD) $(AVAHI_CFLAGS) libpulsecore-@PA_MAJORMIN
 if HAVE_DBUS
 # Serveral module (e.g. libalsa-util.la)
 modlibexec_LTLIBRARIES += \
-		module-console-kit.la \
+		module-console-kit.la
+if USE_SAMSUNG_POLICY
+modlibexec_LTLIBRARIES += \
 		module-policy.la
 endif
+endif
 
 modlibexec_LTLIBRARIES += \
 		module-cli.la \
@@ -1464,9 +1475,11 @@ SYMDEF_FILES = \
 		module-switch-on-connect-symdef.h \
 		module-switch-on-port-available-symdef.h \
 		module-filter-apply-symdef.h \
-		module-filter-heuristics-symdef.h \
+		module-filter-heuristics-symdef.h
+if USE_SAMSUNG_POLICY
+SYMDEF_FILES += \
 		module-policy-symdef.h
-
+endif
 if HAVE_ESOUND
 SYMDEF_FILES += \
 		module-esound-protocol-tcp-symdef.h \
@@ -2146,10 +2159,12 @@ module_rygel_media_server_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_rygel_media_server_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libprotocol-http.la
 module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
+if USE_SAMSUNG_POLICY
 module_policy_la_SOURCES = modules/module-policy.c
 module_policy_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_policy_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(VCONF_LIBS) libprotocol-native.la libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
 module_policy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(VCONF_CFLAGS)
+endif
 
 ###################################
 #        Some minor stuff         #
-- 
2.7.4