From aed870d031b3bc600316720838ef5c6739dd8114 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 3 Jun 2007 04:54:15 +0000
Subject: [PATCH] =?UTF-8?q?Allow=20to=20disable=20Xinerama.=20(#348065,=20?=
 =?UTF-8?q?Diego=20Petten=C3=B2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2007-06-03  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Allow to disable Xinerama.  (#348065, Diego Pettenò)



svn path=/trunk/; revision=18012
---
 ChangeLog    |  4 ++++
 configure.in | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a4228b585..a6c8f29eee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Allow to disable Xinerama.  (#348065, Diego Pettenò)
+
 2007-06-03  Xan Lopez  <xan@gnome.org>
 
 	* gtk/gtknotebook.c: remove index parameter in gtk_notebook_switch_page
diff --git a/configure.in b/configure.in
index c9ee596bec..d91766db09 100644
--- a/configure.in
+++ b/configure.in
@@ -199,6 +199,10 @@ AC_ARG_ENABLE(xkb,
               [AC_HELP_STRING([--enable-xkb],
                               [support XKB [default=maybe]])],,
               [enable_xkb="maybe"])
+AC_ARG_ENABLE(xinerama,
+              [AC_HELP_STRING([--enable-xinerama],
+	                      [support xinerama extension if available [default=yes]])],,
+              [enable_xinerama="yes"])
 AC_ARG_ENABLE(rebuilds,
               [AC_HELP_STRING([--disable-rebuilds],
                               [disable all source autogeneration rules])],,
@@ -1230,12 +1234,12 @@ if test "x$gdktarget" = "xx11"; then
     fi
   fi
 
-  # Check for Xinerama extension (Solaris impl or Xfree impl)
-
-  gtk_save_cppflags="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $x_cflags"
+  if test "x$enable_xinerama" = "xyes"; then
+    # Check for Xinerama extension (Solaris impl or Xfree impl)
+    gtk_save_cppflags="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $x_cflags"
   
-  case "$host" in
+    case "$host" in
       *-*-solaris*)
           # Check for solaris
 	  AC_MSG_CHECKING(for Xinerama support on Solaris)
@@ -1278,8 +1282,9 @@ if test "x$gdktarget" = "xx11"; then
             AC_MSG_RESULT(no)
          fi
          ;;
-  esac
-
+    esac
+  fi
+  
   # set up things for XInput
 
   if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then