[vlc-commits] win packaging: disable activex on win64

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Nov  7 20:21:31 2011 -0500| [2e7c3714ef3990026d93298950113df799ec8d73] | committer: Rafaël Carré

win packaging: disable activex on win64

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2e7c3714ef3990026d93298950113df799ec8d73
---

 extras/package/npapi.am |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/extras/package/npapi.am b/extras/package/npapi.am
index 2e03298..4755df3 100644
--- a/extras/package/npapi.am
+++ b/extras/package/npapi.am
@@ -13,12 +13,19 @@ stamp-npapi-autogen: stamp-npapi-fetch
 	$(SHELL) ./autogen.sh
 	touch $@
 
+if HAVE_WIN64
+CONF_ACTIVEX = --disable-activex
+else
+CONF_ACTIVEX =
+endif
+
 stamp-npapi-configure: stamp-npapi-autogen
 	cd npapi-vlc && \
 	$(SHELL) ./configure \
 		--prefix=/ \
 		--host=$(host_alias) --build=$(build_alias) \
 		--with-mozilla-sdk-path="$(CONTRIB_DIR)/gecko-sdk" \
+		$(CONF_ACTIVEX) \
 		CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" \
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \