16521N/Adiff -rup metacity-2.26.0/configure.in ../metacity-2.26.0/configure.in

16521N/A--- metacity-2.26.0/configure.in 2009-05-15 11:43:22.275520544 +0200

16521N/A+++ ../metacity-2.26.0/configure.in 2009-05-15 11:42:21.247062243 +0200

16521N/A@@ -301,8 +301,28 @@ AC_ARG_ENABLE(xinerama,

16488N/A

16521N/A use_solaris_xinerama=no

16521N/A use_xfree_xinerama=no

16521N/A+

16521N/A if test "${try_xinerama}" != no; then

16521N/A- case "$host" in

16521N/A+

16521N/A+ # Check for XFree

16521N/A+ use_xfree_xinerama=yes

16521N/A+ AC_CHECK_LIB(Xinerama, XineramaQueryExtension,

16521N/A+ [AC_CHECK_HEADER(X11/extensions/Xinerama.h,

16521N/A+ X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"

16521N/A+ if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then

16521N/A+ X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"

16521N/A+ fi

16521N/A+ AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])

16521N/A+ AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),

16521N/A+ use_xfree_xinerama=no,

16521N/A+ [#include <X11/Xlib.h>])],

16521N/A+ use_xfree_xinerama=no, -lXext $ALL_X_LIBS)

16521N/A+ AC_MSG_CHECKING(for Xinerama support on XFree86)

16521N/A+ AC_MSG_RESULT($use_xfree_xinerama);

16521N/A+

16521N/A+ # Fallback to Solaris implementation if it doesn't exist

16521N/A+ if test "x$use_xfree_xinerama" == "xno"; then

16521N/A+ case "$host" in

16521N/A *-*-solaris*)

16521N/A # Check for solaris

16521N/A use_solaris_xinerama=yes

16521N/A@@ -322,24 +342,8 @@ if test "${try_xinerama}" != no; then

16521N/A AC_MSG_CHECKING(for Xinerama support on Solaris)

16521N/A AC_MSG_RESULT($use_solaris_xinerama);

16521N/A ;;

16521N/A- *)

16521N/A- # Check for XFree

16521N/A- use_xfree_xinerama=yes

16521N/A- AC_CHECK_LIB(Xinerama, XineramaQueryExtension,

16521N/A- [AC_CHECK_HEADER(X11/extensions/Xinerama.h,

16521N/A- X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"

16521N/A- if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then

16521N/A- X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"

16521N/A- fi

16521N/A- AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])

16521N/A- AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),

16521N/A- use_xfree_xinerama=no,

16521N/A- [#include <X11/Xlib.h>])],

16521N/A- use_xfree_xinerama=no, -lXext $ALL_X_LIBS)

16521N/A- AC_MSG_CHECKING(for Xinerama support on XFree86)

16521N/A- AC_MSG_RESULT($use_xfree_xinerama);

16521N/A- ;;

16521N/A- esac

16521N/A+ esac

16521N/A+ fi

16521N/A fi

16488N/A

16521N/A CPPFLAGS="$metacity_save_cppflags"