winex11: Add alternative header for xf86vm.
This commit is contained in:
parent
681b08b0fe
commit
7b285a4ebd
|
@ -2724,7 +2724,7 @@ fi
|
||||||
|
|
||||||
# Check whether --with-xxf86vm was given.
|
# Check whether --with-xxf86vm was given.
|
||||||
if test "${with_xxf86vm+set}" = set; then :
|
if test "${with_xxf86vm+set}" = set; then :
|
||||||
withval=$with_xxf86vm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi
|
withval=$with_xxf86vm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -8024,7 +8024,8 @@ fi
|
||||||
X11/extensions/Xinerama.h \
|
X11/extensions/Xinerama.h \
|
||||||
X11/extensions/Xrandr.h \
|
X11/extensions/Xrandr.h \
|
||||||
X11/extensions/Xrender.h \
|
X11/extensions/Xrender.h \
|
||||||
X11/extensions/xf86vmode.h
|
X11/extensions/xf86vmode.h \
|
||||||
|
X11/extensions/xf86vmproto.h
|
||||||
do :
|
do :
|
||||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||||
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_X11_XLIB_H
|
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_X11_XLIB_H
|
||||||
|
@ -8323,7 +8324,7 @@ This is an error since --with-xshape was requested." "$LINENO" 5 ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
|
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" -o "$ac_cv_header_X11_extensions_xf86vmproto_h" = "yes"
|
||||||
then
|
then
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXxf86vm" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXxf86vm" >&5
|
||||||
$as_echo_n "checking for -lXxf86vm... " >&6; }
|
$as_echo_n "checking for -lXxf86vm... " >&6; }
|
||||||
|
|
|
@ -84,7 +84,7 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared
|
||||||
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi])
|
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi])
|
||||||
AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT]))
|
AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT]))
|
||||||
AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]),
|
AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]),
|
||||||
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi])
|
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi])
|
||||||
|
|
||||||
AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
|
AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
|
||||||
AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
|
AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
|
||||||
|
@ -810,7 +810,8 @@ then
|
||||||
X11/extensions/Xinerama.h \
|
X11/extensions/Xinerama.h \
|
||||||
X11/extensions/Xrandr.h \
|
X11/extensions/Xrandr.h \
|
||||||
X11/extensions/Xrender.h \
|
X11/extensions/Xrender.h \
|
||||||
X11/extensions/xf86vmode.h],,,
|
X11/extensions/xf86vmode.h \
|
||||||
|
X11/extensions/xf86vmproto.h],,,
|
||||||
[#ifdef HAVE_X11_XLIB_H
|
[#ifdef HAVE_X11_XLIB_H
|
||||||
# include <X11/Xlib.h>
|
# include <X11/Xlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -863,7 +864,7 @@ then
|
||||||
[XShape ${notice_platform}development files not found, XShape won't be supported.])
|
[XShape ${notice_platform}development files not found, XShape won't be supported.])
|
||||||
|
|
||||||
dnl *** Check for XFree86 VMODE extension
|
dnl *** Check for XFree86 VMODE extension
|
||||||
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
|
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" -o "$ac_cv_header_X11_extensions_xf86vmproto_h" = "yes"
|
||||||
then
|
then
|
||||||
WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
|
WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -30,6 +30,9 @@
|
||||||
#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
|
#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
|
||||||
#include <X11/extensions/xf86vmode.h>
|
#include <X11/extensions/xf86vmode.h>
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef HAVE_X11_EXTENSIONS_XF86VMPROTO_H
|
||||||
|
#include <X11/extensions/xf86vmproto.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "xvidmode.h"
|
#include "xvidmode.h"
|
||||||
|
|
||||||
|
|
|
@ -1029,6 +1029,9 @@
|
||||||
/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */
|
/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */
|
||||||
#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
|
#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <X11/extensions/xf86vmproto.h> header file. */
|
||||||
|
#undef HAVE_X11_EXTENSIONS_XF86VMPROTO_H
|
||||||
|
|
||||||
/* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */
|
/* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */
|
||||||
#undef HAVE_X11_EXTENSIONS_XINERAMA_H
|
#undef HAVE_X11_EXTENSIONS_XINERAMA_H
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue