[vlc-commits] Make sure HAS_{W,M}IDL_COMPILER is defined
Rafaël Carré
git at videolan.org
Sun Nov 13 21:14:38 CET 2011
npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Nov 13 14:37:35 2011 -0500| [92fccd22b5ac75e59e8308957fc5703c522fb568] | committer: Rafaël Carré
Make sure HAS_{W,M}IDL_COMPILER is defined
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=92fccd22b5ac75e59e8308957fc5703c522fb568
---
configure.ac | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index c482aee..d67e2ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,16 +127,14 @@ glibc run-time.])
AC_PATH_XTRA
PKG_CHECK_MODULES([LIBVLC], [libvlc >= 1.1.0])
+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
- WIDL="no"
-
- AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no")
- AM_CONDITIONAL(HAS_WIDL_COMPILER, test "${WIDL}" != "no")
AC_LANG_PUSH(C++)
AC_CHECK_HEADER(ole2.h,,[AC_MSG_ERROR([required OLE header ole2.h is missing from your system])])
@@ -145,6 +143,9 @@ AS_IF([test "${SYS}" = "mingw32"],[
AC_LANG_POP(C++)
])
+AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no")
+AM_CONDITIONAL(HAS_WIDL_COMPILER, test "${WIDL}" != "no")
+
AC_ARG_WITH(mozilla-pkg,
[ --with-mozilla-pkg=PKG look for PKG.pc to build the mozilla plugin.])
AC_ARG_VAR([MOZILLA_CFLAGS], [C compiler flags for Mozilla, overriding pkg-config])
More information about the vlc-commits
mailing list