Commit 2579d74e authored by damienf's avatar damienf
Browse files

configure.ac: fixed "header present but cannot be compiled" warning for dshow.h and objsafe.h

parent a2109377
...@@ -1726,10 +1726,12 @@ if test "${enable_dshow}" != "no" ...@@ -1726,10 +1726,12 @@ if test "${enable_dshow}" != "no"
then then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
then then
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(dshow.h, AC_CHECK_HEADERS(dshow.h,
[ VLC_ADD_PLUGINS([dshow]) [ VLC_ADD_PLUGINS([dshow])
VLC_ADD_CXXFLAGS([dshow],[]) VLC_ADD_CXXFLAGS([dshow],[])
VLC_ADD_LDFLAGS([dshow],[-lole32 -loleaut32 -luuid]) ]) VLC_ADD_LDFLAGS([dshow],[-lole32 -loleaut32 -luuid]) ])
AC_LANG_POP(C++)
fi fi
fi fi
...@@ -4691,16 +4693,21 @@ then ...@@ -4691,16 +4693,21 @@ then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
then then
AC_CHECK_PROGS(MIDL, [midl widl], no) AC_CHECK_PROGS(MIDL, [midl widl], no)
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(ole2.h olectl.h, AC_CHECK_HEADERS(ole2.h olectl.h,
[ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) [ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi])
AC_CHECK_HEADERS(objsafe.h, AC_CHECK_HEADERS(objsafe.h,
VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]) VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),,
[#if HAVE_OLE2_H
# include <ole2.h>
#endif]
) )
activex=: activex=:
], ],
[ AC_MSG_ERROR([required OLE headers are missing from your system]) ] [ AC_MSG_ERROR([required OLE headers are missing from your system]) ]
) )
AC_LANG_POP(C++)
fi fi
fi fi
AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)]) AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment