[vlc-commits] Add an option to disable activex

[Rafaël Carré]

npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Nov  7 20:17:15 2011 -0500| [f152e833f941cf9cf1f35a535f153830a3a8ae8d] | committer: Rafaël Carré

Add an option to disable activex

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

 Makefile.am  |    2 +-
 configure.ac |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 42b29fe..ffea247 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS = \
 
 DIST_SUBDIRS= share npapi activex
 SUBDIRS = npapi
-if HAVE_WIN32
+if BUILD_ACTIVEX
 SUBDIRS += activex
 endif
 
diff --git a/configure.ac b/configure.ac
index e16f812..be1ce9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,8 @@ case "${host_os}" in
 esac
 AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
 AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
+AC_ARG_ENABLE(activex, AS_HELP_STRING(--disable-activex, Do not build ActiveX plugin))
+AM_CONDITIONAL(BUILD_ACTIVEX, test "${SYS}" = "mingw32" -a "${enable_activex}" != "no")
 
 dnl
 dnl Buggy glibc prevention. Purposedly not cached.