Ticket #206: x11_check.diff

configure

@@ -3381 +3385 @@
 fi
 
 
-echocheck "X11 libs presence"
+echocheck "working X11 libs"
 if test -z "$_ld_x11" ; then
   for I in /usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 /usr/lib ; do
     if test -d "$I" && ( test -f "$I/libX11.so" || test -f "$I/libX11.a" || test -f "$I/libX11.dll.a" ) ; then
@@ -3390 +3394 @@
       else
         _ld_x11="-L$I"
       fi
+      _ld_x11="$_ld_x11 -lXext -lX11 $_ld_sock"
+      cat > $TMPC <<EOF
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; }
+EOF
+     if cc_check $_inc_x11 $_ld_x11 ; then
       echores "yes (using $I)"
       break;
+     else
+      _ld_x11=""
+     fi
     fi
   done
   if test -z "$_ld_x11" ; then
@@ -3400 +3414 @@
   fi
 else
   echores "yes (using $_ld_x11)"
+  _ld_x11="$_ld_x11 -lXext -lX11 $_ld_sock"
 fi
-_ld_x11="$_ld_x11 -lXext -lX11 $_ld_sock"
 
 
 echocheck "X11"
-if test "$_x11" != no ; then
-  cat > $TMPC <<EOF
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; }
-EOF
-  _x11=no
-  cc_check $_inc_x11 $_ld_x11 && _x11=yes
+if test "$_x11" = auto ; then
+  # X11 lib check will set to no when not working
+  _x11=yes
 fi
 if test "$_x11" = yes ; then
   _def_x11='#define HAVE_X11 1'