autoconf build fix

one todo item less !

diff --git a/TODO b/TODO
index cfeed9a21f3b23ac0c790565cab3c7282f05bc9b..a3b6b631eb56427169b9ba08ebf453c5f79a243c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -477,8 +477,8 @@ Difficulty: Hard
 Urgency: Wishlist
 Platform: Windows
 Description: ActiveX control for VLC
- We need an ActiveX version of VLC for IE intergration
-Status: Todo
+ We need an ActiveX version of VLC for IE integration
+Status: Done by damienf
 
 Task
 Difficulty: Easy

diff --git a/configure.ac b/configure.ac
index 916dbe5244a385618ecc40696af4ee521f6dcd33..ec3906759b7cdfcd237ab754205d9e9216c46e1d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3919,6 +3919,7 @@ dnl
 dnl  Microsoft ActiveX support
 dnl
 AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)])
+AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}")
 AC_ARG_ENABLE(activex,
   [  --enable-activex        build a vlc-based ActiveX control (default enabled on Win32)])
 if test "${enable_activex}" != "no"
@@ -3926,7 +3927,6 @@ then
   if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
   then
     AC_CHECK_PROG(MIDL, midl, :)
-    AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}")
     AC_CHECK_HEADERS(ole2.h olectl.h,
       [ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
         VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid])