[Kimchi-devel] [PATCH] [Wok 2/2] Remove spice-html5 references from Wok build

spice-html5 is a Kimchi dependency and not needed by Wok. So remove references to it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com&gt; --- configure.ac | 11 +---------- src/wok/Makefile.am | 11 ++--------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index fbc531b..2f8d13a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2016 +# Copyright IBM Corp, 2013-2017 # # Code derived from Project Kimchi # @@ -61,15 +61,6 @@ if test "x$with_systemdsystemunitdir" != xno; then AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) fi -AC_ARG_WITH( - [spice-html5], - [AS_HELP_STRING([--with-spice-html5], - [Build Kimchi with spice-html5 @<:@default=no@:>@])], - , - [with_spice_html5="no"] -) -AM_CONDITIONAL([WITH_SPICE], [test "x$with_spice_html5" = xyes]) - AC_CONFIG_FILES([ po/Makefile.in po/gen-pot diff --git a/src/wok/Makefile.am b/src/wok/Makefile.am index 9a2481f..081f143 100644 --- a/src/wok/Makefile.am +++ b/src/wok/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -29,12 +29,6 @@ EXTRA_DIST = \ API.json \ config.py.in -if WITH_SPICE -WITH_SPICE=yes -else -WITH_SPICE=no -endif - wokdir = $(pythondir)/wok install-data-local: @@ -52,8 +46,7 @@ do_substitution = \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ -e 's,[@]wokdir[@],$(wokdir),g' \ -e 's,[@]wokversion[@],$(PACKAGE_VERSION),g' \ - -e 's,[@]wokrelease[@],$(PACKAGE_RELEASE),g' \ - -e 's,[@]withspice[@],$(WITH_SPICE),g' + -e 's,[@]wokrelease[@],$(PACKAGE_RELEASE),g' config.py: config.py.in Makefile -- 2.7.4