diff --git a/ChangeLog b/ChangeLog
index 37b3cdf889..6bd5a9b5a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep  4 23:37:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Fix the Solaris Xinerama checks.  (#151754)
+
 Sat Sep  4 22:45:49 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentry.c (gtk_entry_backspace): Don't refuse to delete
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 37b3cdf889..6bd5a9b5a2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Sat Sep  4 23:37:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Fix the Solaris Xinerama checks.  (#151754)
+
 Sat Sep  4 22:45:49 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentry.c (gtk_entry_backspace): Don't refuse to delete
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 37b3cdf889..6bd5a9b5a2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Sat Sep  4 23:37:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Fix the Solaris Xinerama checks.  (#151754)
+
 Sat Sep  4 22:45:49 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentry.c (gtk_entry_backspace): Don't refuse to delete
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 37b3cdf889..6bd5a9b5a2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Sat Sep  4 23:37:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Fix the Solaris Xinerama checks.  (#151754)
+
 Sat Sep  4 22:45:49 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentry.c (gtk_entry_backspace): Don't refuse to delete
diff --git a/configure.in b/configure.in
index dd6cbb4c7e..002412466f 100644
--- a/configure.in
+++ b/configure.in
@@ -1099,12 +1099,15 @@ if test "x$gdktarget" = "xx11"; then
           # Check for solaris
 	  use_solaris_xinerama=yes
 	  AC_CHECK_LIB(Xext, XineramaGetInfo,
-			use_solaris_xinerama=yes, use_solaris_xinerama=no)
+			use_solaris_xinerama=yes, 
+			use_solaris_xinerama=no,
+			-lXext $x_libs_for_checks)
 	  if test "x$use_solaris_xinerama" = "xyes"; then
 	      AC_CHECK_HEADER(X11/extensions/xinerama.h,
 	        [GTK_ADD_LIB(x_extra_libs,Xext)
 		AC_DEFINE(HAVE_SOLARIS_XINERAMA)
-		AC_DEFINE(HAVE_XINERAMA)], use_solaris_xinerama=no, -lXext $x_libs_for_checks)
+		AC_DEFINE(HAVE_XINERAMA)], 
+		use_solaris_xinerama=no,[#include <X11/Xlib.h>])
 	  fi	
 	  AC_MSG_CHECKING(for Xinerama support on Solaris)
 	  AC_MSG_RESULT($use_solaris_xinerama);