vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sat Aug 20 13:06:36 2011 +0300| [99050a07ce0edc2b113349de656d19a019a26f31] | committer: Rémi Denis-Courmont
Fix d2d1.h detection: C++ is required > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=99050a07ce0edc2b113349de656d19a019a26f31 --- configure.ac | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 4f35750..618f24f 100644 --- a/configure.ac +++ b/configure.ac @@ -3334,18 +3334,21 @@ dnl dnl Windows Direct2D plugin dnl AC_ARG_ENABLE(direct2d, - [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)]) -if test "${enable_direct2d}" != "no"; then - if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" - then - AC_CHECK_HEADERS(d2d1.h, - [ - VLC_ADD_PLUGIN([direct2d]) - VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32]) - ], [AC_MSG_WARN([Cannot find Direct2D headers!])] - ) - fi -fi + [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)],, [ + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + enable_direct2d="no" + ]) +]) +AS_IF([test "${enable_direct2d}" != "no"], [ + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS(d2d1.h, [ + VLC_ADD_PLUGIN([direct2d]) + VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32]) + ], [ + AC_MSG_WARN([Cannot find Direct2D headers!]) + ]) + AC_LANG_POP([C++]) +]) dnl dnl win32 GDI plugin _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
