Henri Verbeet : configure: Include Xlib.h before Xrandr.h.
Alexandre Julliard
julliard at winehq.org
Thu Feb 14 15:01:33 CST 2013
Module: wine
Branch: master
Commit: e89edd60fefafd6440b155b49d43b06b7d7b778f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89edd60fefafd6440b155b49d43b06b7d7b778f
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Feb 14 21:16:11 2013 +0100
configure: Include Xlib.h before Xrandr.h.
---
configure | 1 +
configure.ac | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 2998c6a..223ec5d 100755
--- a/configure
+++ b/configure
@@ -8824,6 +8824,7 @@ _ACEOF
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>
int
main ()
diff --git a/configure.ac b/configure.ac
index d6fccaa..fd7d0b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1076,8 +1076,8 @@ then
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func; if (func) return 0;]])],
[WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/Xrandr.h>]],
- [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])],
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
+#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])],
[AC_DEFINE(HAVE_XRRGETSCREENRESOURCES, 1,
[Define if Xrandr has the XRRGetScreenResources function])])],,
[$X_LIBS $XLIB $X_EXTRA_LIBS])])
More information about the wine-cvs
mailing list