Commit d1758198 authored by Vincent Untz's avatar Vincent Untz

[build] Really fix build without randr

parent e49bdba1
......@@ -143,7 +143,7 @@ PKG_CHECK_MODULES(XLIB, x11,
if test "x$no_x" = xyes; then
AC_MSG_ERROR("no (requires X development libraries)")
else
XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXrandr $X_EXTRA_LIBS"
XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
XLIB_CFLAGS=$X_CFLAGS
fi])
AC_SUBST(X11_PACKAGE)
......@@ -155,7 +155,7 @@ dnl Checks for X's RANDR extension
if $PKG_CONFIG --atleast-version $XRANDR_REQUIRED xrandr; then
echo "Building with the RANDR extension"
AC_DEFINE(HAVE_RANDR, 1,
[Define if the xrandr-1.2 library is present])
[Define if the xrandr-$XRANDR_REQUIRED library is present])
with_randr=yes
RANDR_PACKAGE=xrandr
else
......
......@@ -31,12 +31,13 @@
#include <glib.h>
#include <glib/gstdio.h>
#include <X11/Xlib.h>
#include <gdk/gdkx.h>
#undef GNOME_DISABLE_DEPRECATED
#include "libgnomeui/gnome-rr-config.h"
#include "edid.h"
#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>
#include <gdk/gdkx.h>
#include "gnome-rr-private.h"
#define CONFIG_INTENDED_BASENAME "monitors.xml"
......
#ifndef GNOME_RR_PRIVATE_H
#define GNOME_RR_PRIVATE_H
#ifdef HAVE_RANDR
#include <X11/extensions/Xrandr.h>
#endif
typedef struct ScreenInfo ScreenInfo;
struct ScreenInfo
......
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