diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-06-03 04:54:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-06-03 04:54:15 +0000 |
| commit | aed870d031b3bc600316720838ef5c6739dd8114 (patch) | |
| tree | 249900fb4243b32b99c89ae553ad7b64c82ee499 | |
| parent | 6a0de76ba52e49b1b0463a7d85c94f2966879e2c (diff) | |
| download | gtk+-aed870d031b3bc600316720838ef5c6739dd8114.tar.gz | |
Allow to disable Xinerama. (#348065, Diego Pettenò)
2007-06-03 Matthias Clasen <mclasen@redhat.com>
* configure.in: Allow to disable Xinerama. (#348065, Diego Pettenò)
svn path=/trunk/; revision=18012
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 19 |
2 files changed, 16 insertions, 7 deletions
@@ -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 |