ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Add a check for XInput2 headers.

This commit is contained in:
Alexandre Julliard 2011-04-13 18:51:50 +02:00
parent 24ba89c529
commit 77e05ce4e5
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@ -806,6 +806,7 @@ with_xcomposite
with_xcursor with_xcursor
with_xinerama with_xinerama
with_xinput with_xinput
with_xinput2
with_xml with_xml
with_xrandr with_xrandr
with_xrender with_xrender
@ -1497,6 +1498,7 @@ Optional Packages:
--without-xcursor do not use the Xcursor extension --without-xcursor do not use the Xcursor extension
--without-xinerama do not use Xinerama (multi-monitor support) --without-xinerama do not use Xinerama (multi-monitor support)
--without-xinput do not use the Xinput extension --without-xinput do not use the Xinput extension
--without-xinput2 do not use the Xinput 2 extension
--without-xml do not use XML --without-xml do not use XML
--without-xrandr do not use Xrandr (resolution changes) --without-xrandr do not use Xrandr (resolution changes)
--without-xrender do not use the Xrender extension --without-xrender do not use the Xrender extension
@ -2722,6 +2724,12 @@ if test "${with_xinput+set}" = set; then :
fi fi
# Check whether --with-xinput2 was given.
if test "${with_xinput2+set}" = set; then :
withval=$with_xinput2; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput2_h=no; fi
fi
# Check whether --with-xml was given. # Check whether --with-xml was given.
if test "${with_xml+set}" = set; then : if test "${with_xml+set}" = set; then :
withval=$with_xml; withval=$with_xml;
@ -8035,6 +8043,7 @@ fi
X11/Xcursor/Xcursor.h \ X11/Xcursor/Xcursor.h \
X11/extensions/shape.h \ X11/extensions/shape.h \
X11/extensions/XInput.h \ X11/extensions/XInput.h \
X11/extensions/XInput2.h \
X11/extensions/XShm.h \ X11/extensions/XShm.h \
X11/extensions/Xcomposite.h \ X11/extensions/Xcomposite.h \
X11/extensions/Xinerama.h \ X11/extensions/Xinerama.h \
@ -8231,6 +8240,18 @@ This is an error since --with-xinput was requested." "$LINENO" 5 ;;
esac esac
fi fi
if test "x$ac_cv_lib_soname_Xi" != x
then
if test "$ac_cv_header_X11_extensions_XInput2_h" != "yes"; then :
case "x$with_xinput2" in
x) as_fn_append wine_notices "|XInput2 headers not found, the XInput 2 extension won't be supported." ;;
xno) ;;
*) as_fn_error $? "XInput2 headers not found, the XInput 2 extension won't be supported.
This is an error since --with-xinput2 was requested." "$LINENO" 5 ;;
esac
fi
fi
if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
then then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXext" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXext" >&5

10
configure.ac
View File

@ -91,6 +91,8 @@ AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi])
AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]), AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi])
AC_ARG_WITH(xinput2, AS_HELP_STRING([--without-xinput2],[do not use the Xinput 2 extension]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput2_h=no; fi])
AC_ARG_WITH(xml, AS_HELP_STRING([--without-xml],[do not use XML])) AC_ARG_WITH(xml, AS_HELP_STRING([--without-xml],[do not use XML]))
AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)]), AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi])
@ -937,6 +939,7 @@ then
X11/Xcursor/Xcursor.h \ X11/Xcursor/Xcursor.h \
X11/extensions/shape.h \ X11/extensions/shape.h \
X11/extensions/XInput.h \ X11/extensions/XInput.h \
X11/extensions/XInput2.h \
X11/extensions/XShm.h \ X11/extensions/XShm.h \
X11/extensions/Xcomposite.h \ X11/extensions/Xcomposite.h \
X11/extensions/Xinerama.h \ X11/extensions/Xinerama.h \
@ -975,6 +978,13 @@ then
WINE_NOTICE_WITH(xinput,[test "x$ac_cv_lib_soname_Xi" = "x"], WINE_NOTICE_WITH(xinput,[test "x$ac_cv_lib_soname_Xi" = "x"],
[libxi ${notice_platform}development files not found, the Xinput extension won't be supported.]) [libxi ${notice_platform}development files not found, the Xinput extension won't be supported.])
dnl *** Check for X input 2 extension
if test "x$ac_cv_lib_soname_Xi" != x
then
WINE_NOTICE_WITH(xinput2,[test "$ac_cv_header_X11_extensions_XInput2_h" != "yes"],
[XInput2 headers not found, the XInput 2 extension won't be supported.])
fi
dnl *** Check for X Shm extension dnl *** Check for X Shm extension
if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
then then

3
include/config.h.in
View File

@ -1094,6 +1094,9 @@
/* 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
/* Define to 1 if you have the <X11/extensions/XInput2.h> header file. */
#undef HAVE_X11_EXTENSIONS_XINPUT2_H
/* Define to 1 if you have the <X11/extensions/XInput.h> header file. */ /* Define to 1 if you have the <X11/extensions/XInput.h> header file. */
#undef HAVE_X11_EXTENSIONS_XINPUT_H #undef HAVE_X11_EXTENSIONS_XINPUT_H