diff --git a/configure.ac b/configure.ac
index ea7e43cd..8af77209 100644
--- a/configure.ac
+++ b/configure.ac
@@ -534,14 +534,13 @@ AC_ARG_ENABLE(xinerama,
 if test "$xinerama" = yes; then
 	AC_CHECK_LIB(Xinerama, XineramaQueryScreens, 
                 [XLIBS="-lXinerama $XLIBS"
-		AC_DEFINE(XINERAMA, 1, [define if you want support for the XINERAMA extension (XFree86 version/set by configure)])
+		AC_DEFINE(XINERAMA, 1, [define if you want support for the XINERAMA extension (set by configure)])
                 xinerama=yes],
 		xinerama=no, $XLFLAGS $XLIBS)
 
 	AC_CHECK_LIB(Xext, XineramaGetInfo,
-                [AC_DEFINE(SOLARIS_XINERAMA, 1, [define if you want support for the XINERAMA extension (Solaris version/set by configure)])
-                xinerama=yes],
-		xinerama=no, $XLFLAGS $XLIBS)
+                [AC_DEFINE(SOLARIS_XINERAMA, 1, [define if you want support for the XINERAMA extension and are in Solaris (set by configure)])
+                ], [], $XLFLAGS $XLIBS)
 fi