diff options
| author | jacob berkman <jacob@ximian.com> | 2002-09-05 20:05:23 +0000 |
|---|---|---|
| committer | Jacob Berkman <jberkman@src.gnome.org> | 2002-09-05 20:05:23 +0000 |
| commit | 66257c44e0df116b2c55390b1dbad8c5217a6ef2 (patch) | |
| tree | c83771fd451506e2d6d88113c00bd8f3f8e76c4b /configure.in | |
| parent | bcc5265f6cc00517264609bc7f2b1cb6c7a4181b (diff) | |
| download | gtk+-66257c44e0df116b2c55390b1dbad8c5217a6ef2.tar.gz | |
fix non-solaris xinerama checks (bug #89732)
2002-09-05 jacob berkman <jacob@ximian.com>
* configure.in: fix non-solaris xinerama checks (bug #89732)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.in b/configure.in index bf2b7f8e3f..f1977dc3eb 100644 --- a/configure.in +++ b/configure.in @@ -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, |