diff options
author | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2017-09-18 06:56:12 +0200 |
---|---|---|
committer | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2017-09-18 06:56:12 +0200 |
commit | cbd91e801bf71eb0e7b2d5a2264c36007a3e12cc (patch) | |
tree | 482d38dbd98a11bcd9f8ad02557f3f16a0b0e7c2 /configure.ac | |
parent | 0a90c2ac60cbb511ec24a52d723291d82a0124ba (diff) | |
download | ratpoison-cbd91e801bf71eb0e7b2d5a2264c36007a3e12cc.zip |
Move #ifdef HAVE_XRANDR in xrandr.c
- always build xrandr.c
- provide stubs in xrandr.c; only init_xrandr() anc xrandr_fill_screen()
are safe to call if XRandR support is not built in
Code that wants to use XRandR outside xrandr.c should test rp_have_xrandr.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 76cb5c1..2ea4315 100644 --- a/configure.ac +++ b/configure.ac @@ -184,17 +184,13 @@ CPPFLAGS="$mysavedCPPFLAGS" AC_CHECK_LIB(Xrandr, XRRGetScreenResources, [libxrandr=yes], [libxrandr=no], [$X_LIBS $X_EXTRA_LIBS]) -compile_xrandr=no AS_CASE(["$with_xrandr:$xrandr_h:$libxrandr"], [yes:no:*], [AC_MSG_ERROR([*** Can't enable Xrandr support, header Xrandr.h not found.])], [yes:*:no], [AC_MSG_ERROR([*** Can't enable Xrandr support, libXrandr not found.])], [check:no:*], [AC_MSG_ERROR([*** Header Xrandr.h not found, use ./configure --without-xrandr to build without multiple screens support.])], [check:*:no], [AC_MSG_ERROR([*** libXrandr not found, use ./configure --without-xrandr to build without multiple screens support.])], [yes:yes:yes|check:yes:yes], [X_LIBS="-lXrandr $X_LIBS" - AC_DEFINE(HAVE_XRANDR, 1, [Define to 1 if you want Xrandr support.]) - compile_xrandr=yes]) - -AM_CONDITIONAL(HAVE_XRANDR, [test "$compile_xrandr" = yes]) + AC_DEFINE(HAVE_XRANDR, 1, [Define to 1 if you want Xrandr support.])]) AC_SUBST(X_LIBS) AC_SUBST(X_EXTRA_LIBS) |