* configure.ac, activex/Makefile.am: conditional compile of the activex plugin.

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 696234d9ba052d20bd6548a1478f495fc7bbe6c0..d89eaf25af03bba1665ce4ae4c2ddd24604ccecf 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -56,6 +56,8 @@ DIST_misc = \
 
 LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
 
+if BUILD_ACTIVEX
+
 noinst_LIBRARIES_activex = libaxvlc.a
 axvlc_DATA = axvlc$(LIBEXT)
 axvlcdir = $(libdir)
@@ -97,6 +99,12 @@ noinst_axvlc_rcdir = $(libdir)
 axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp $(axvlc_tlb_DATA)
        $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
 
+else
+
+clean-tlb:
+
+endif
+
 ###############################################################################
 # Stamp rules
 ###############################################################################

diff --git a/configure.ac b/configure.ac
index 04e0adb2a0b24d2023a78d6c7a13c28241c2e66a..372f8319bad54e9655d454bd90da15ac2d50ad17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3931,6 +3931,7 @@ then
         AC_CHECK_HEADERS(objsafe.h,
           VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER])
         )
+        activex=:
       ],
       [ AC_MSG_ERROR([required OLE headers are missing from your system]) ]
     )
@@ -3938,6 +3939,7 @@ then
 fi
 AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)])
 AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}")
+AM_CONDITIONAL(BUILD_ACTIVEX,${activex})
 
 dnl
 dnl  Mozilla plugin