Skip to content

V
vlc
Commit e249f6a3 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

Fix a small bug in header detection for Activex

parent 9b499eae
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 12 deletions
configure.ac
View file @ e249f6a3
...@@ -5265,18 +5265,23 @@ then ...@@ -5265,18 +5265,23 @@ then
WIDL=no WIDL=no
fi fi
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(ole2.h olectl.h, AC_CHECK_HEADERS(ole2.h,
[ VLC_ADD_CPPFLAGS([activex],[-D_MIDL_USE_GUIDDEF_]) [AC_CHECK_HEADERS(olectl.h,
VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) [ VLC_ADD_CPPFLAGS([activex],[-D_MIDL_USE_GUIDDEF_])
VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
AC_CHECK_HEADERS(objsafe.h, VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi])
VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),, AC_CHECK_HEADERS(objsafe.h,
[#if HAVE_OLE2_H VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),,
# include <ole2.h> [
#endif] #if HAVE_OLE2_H
) # include <ole2.h>
activex=: #endif
], ]
)
activex=:
],
[ AC_MSG_ERROR([required OLE headers are missing from your system]) ]
)],
[ 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++) AC_LANG_POP(C++)
......
Markdown is supported
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