Make XRandr detection work better.

2002-10-27  Anders Carlsson  <andersca@gnu.org>

	* configure.in: Make XRandr detection work better.
This commit is contained in:
Anders Carlsson 2002-10-27 15:15:27 +00:00 committed by Anders Carlsson
parent 81089c2d8c
commit c9c67387ce
2 changed files with 11 additions and 7 deletions

View File

@ -1,3 +1,7 @@
2002-10-27 Anders Carlsson <andersca@gnu.org>
* configure.in: Make XRandr detection work better.
2002-10-27 Havoc Pennington <hp@pobox.com> 2002-10-27 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_free): move * src/window.c (meta_window_free): move

View File

@ -168,23 +168,23 @@ CPPFLAGS="$metacity_save_cppflags"
SHAPE_LIBS= SHAPE_LIBS=
found_shape=no found_shape=no
AC_CHECK_LIB(Xext, XShapeQueryExtension, AC_CHECK_LIB(Xext, XShapeQueryExtension,
[AC_CHECK_HEADERS(X11/extensions/shape.h, [AC_CHECK_HEADER(X11/extensions/shape.h,
SHAPE_LIBS=-lXext found_shape=yes)], SHAPE_LIBS=-lXext found_shape=yes)],
, $ALL_X_LIBS) , $ALL_X_LIBS)
if test "$found_shape" = "no"; then if test "x$found_shape" = "xyes"; then
AC_DEFINE(HAVE_SHAPE) AC_DEFINE(HAVE_SHAPE)
fi fi
RANDR_LIBS= RANDR_LIBS=
found_randr=no found_randr=no
AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration, AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
[AC_CHECK_HEADERS(X11/extensions/Xrandr.h, [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
RANDR_LIBS=-lXrandr, found_randr=yes, RANDR_LIBS=-lXrandr found_randr=yes,,
[#include <X11/Xlib.h>])], [#include <X11/Xlib.h>])],
, -lXrender $ALL_X_LIBS) , -lXrender $ALL_X_LIBS)
if test "$found_randr" = "yes"; then if test "x$found_randr" = "xyes"; then
AC_DEFINE(HAVE_RANDR) AC_DEFINE(HAVE_RANDR)
fi fi