[vlc-commits] Fix widl/midl detection and widl compilation

[Rafaël Carré]

npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jun  8 06:01:21 2012 -0400| [1aef7d603ab48815f6dbc9a52b728894763bd102] | committer: Rafaël Carré

Fix widl/midl detection and widl compilation

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

 activex/Makefile.am |    4 +++-
 configure.ac        |   10 ++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 14e2924..4c90f0c 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -109,8 +109,10 @@ clean-tlb:
 else
 if HAS_WIDL_COMPILER
 
+WINE_SDK_PATH ?= /usr/include/wine/windows
+
 axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl
-	$(WIDL) -I$(WINE_SDK_PATH)/include -tuh -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h axvlc.idl
+	$(WIDL) -I$(WINE_SDK_PATH) -tuh -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h axvlc.idl
 
 clean-tlb:
 	rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h
diff --git a/configure.ac b/configure.ac
index d671e5b..40611e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,20 +104,18 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
 
 dnl
 dnl Check widl/midl tools for win32
-WIDL="no"
-MIDL="no"
 AS_IF([test "${SYS}" = "mingw32"],[
     AC_CHECK_PROGS(MIDL, [midl], no)
-
-    dnl FIXME
-    dnl AC_CHECK_PROGS(WIDL, [widl], no)
-    dnl
+    AC_CHECK_PROGS(WIDL, [widl], no)
 
     AC_LANG_PUSH(C++)
     AC_CHECK_HEADER(ole2.h,,[AC_MSG_ERROR([required OLE header ole2.h is missing from your system])])
     AC_CHECK_HEADER(olectl.h,,[AC_MSG_ERROR([required OLE header olectl.h is missing from your system])])
     AC_CHECK_HEADERS(objsafe.h,,,[#include <ole2.h>])
     AC_LANG_POP(C++)
+],[
+    MIDL="no"
+    WIDL="no"
 ])
 
 AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no")