AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-07 17:20:07 +00:00
Code Issues Projects Releases Wiki Activity

fix non-solaris xinerama checks (bug #89732)

Browse Source 
2002-09-05  jacob berkman  <jacob@ximian.com>

	* configure.in: fix non-solaris xinerama checks (bug #89732)
This commit is contained in:
jacob berkman 2002-09-05 20:05:23 +00:00 committed by Jacob Berkman
parent bcc5265f6c
commit 66257c44e0
7 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732)
* autogen.sh: get automake-1.4 changes from -2-0 branch
2002-09-05 Tor Lillqvist <tml@iki.fi>

2
ChangeLog.pre-2-10
View File

@ -1,5 +1,7 @@
2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732)
* autogen.sh: get automake-1.4 changes from -2-0 branch
2002-09-05 Tor Lillqvist <tml@iki.fi>

2
ChangeLog.pre-2-2
View File

@ -1,5 +1,7 @@
2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732)
* autogen.sh: get automake-1.4 changes from -2-0 branch
2002-09-05 Tor Lillqvist <tml@iki.fi>

2
ChangeLog.pre-2-4
View File

@ -1,5 +1,7 @@
2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732)
* autogen.sh: get automake-1.4 changes from -2-0 branch
2002-09-05 Tor Lillqvist <tml@iki.fi>

2
ChangeLog.pre-2-6
View File

@ -1,5 +1,7 @@
2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732)
* autogen.sh: get automake-1.4 changes from -2-0 branch
2002-09-05 Tor Lillqvist <tml@iki.fi>

2
ChangeLog.pre-2-8
View File

@ -1,5 +1,7 @@
2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732)
* autogen.sh: get automake-1.4 changes from -2-0 branch
2002-09-05 Tor Lillqvist <tml@iki.fi>

11
configure.in
View File

@ -1058,6 +1058,9 @@ if test "x$gdktarget" = "xx11"; then
# Check for Xinerama extension (Solaris impl or Xfree impl)
gtk_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $x_cflags"
case "$host" in
*-*-solaris*)
# Check for solaris
@ -1070,7 +1073,7 @@ if test "x$gdktarget" = "xx11"; then
x_extra_libs="-lXext $x_extra_libs"
fi
AC_DEFINE(HAVE_SOLARIS_XINERAMA)
AC_DEFINE(HAVE_XINERAMA), use_solaris_xinerama=no)
AC_DEFINE(HAVE_XINERAMA), use_solaris_xinerama=no, -lXext $x_libs_for_checks)
fi
AC_MSG_CHECKING(for Xinerama support on Solaris)
AC_MSG_RESULT($use_solaris_xinerama);
@ -1079,7 +1082,7 @@ if test "x$gdktarget" = "xx11"; then
# Check for XFree
use_xfree_xinerama=yes
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
[AC_CHECK_HEADER(extensions/Xinerama.h,
[AC_CHECK_HEADER(X11/extensions/Xinerama.h,
x_extra_libs="-lXinerama $x_extra_libs"
if test -z "`echo $x_extra_libs $x_libs | grep "\-lXext" 2> /dev/null`"; then
x_extra_libs="-lXext $x_extra_libs"
@ -1087,12 +1090,14 @@ if test "x$gdktarget" = "xx11"; then
AC_DEFINE(HAVE_XFREE_XINERAMA)
AC_DEFINE(HAVE_XINERAMA),
use_xfree_xinerama=no)],
use_xfree_xinerama=no)
use_xfree_xinerama=no, -lXext $x_libs_for_checks)
AC_MSG_CHECKING(for Xinerama support on XFree86)
AC_MSG_RESULT($use_xfree_xinerama);
;;
esac
CPPFLAGS="$gtk_save_cppflags"
# Check for shaped window extension
AC_CHECK_LIB(Xext, XShapeCombineMask,