# HG changeset patch
# User Thomas Treichl <Thomas.Treichl@gmx.net>
# Date 1234848450 18000
# Node ID af676d09da0868fbb65a988b1f79a8279c5c164a
# Parent  a186c5b4f2645f3ab4f35f05631cdc174dbe2819
Fix test for X11 if "--without-x" is given.

diff -r a186c5b4f264 -r af676d09da08 ChangeLog
--- a/ChangeLog	Tue Feb 17 00:01:33 2009 -0500
+++ b/ChangeLog	Tue Feb 17 00:27:30 2009 -0500
@@ -1,3 +1,7 @@
+2009-02-17  Thomas Treichl  <Thomas.Treichl@gmx.net>
+
+	* configure.in: Fix test for X11 if "--without-x" is given.
+
 2009-02-16  Jaroslav Hajek  <highegg@gmail.com>
 
 	* NEWS: Yet more updates.
diff -r a186c5b4f264 -r af676d09da08 configure.in
--- a/configure.in	Tue Feb 17 00:01:33 2009 -0500
+++ b/configure.in	Tue Feb 17 00:27:30 2009 -0500
@@ -264,10 +264,17 @@
 if test "$have_x"; then
   AC_DEFINE(HAVE_X_WINDOWS, 1, [Define if you have X11])
 
-  X11_INCFLAGS="$x_includes"
+  if test $x_includes != "NONE"; then
+    X11_INCFLAGS="$x_includes"
+  fi
   AC_SUBST(X11_INCFLAGS)
 
-  AC_CHECK_LIB(X11, XrmInitialize, [X11_LIBS=-lX11], [X11_LIBS=])
+  if test -z $x_libraries; then
+    AC_CHECK_LIB(X11, XrmInitialize, [X11_LIBS=-lX11], [X11_LIBS=])
+  elif test $x_libraries != "NONE"; then
+    AC_CHECK_LIB(X11, XrmInitialize, 
+      [X11_LIBS="-L$x_libraries -lX11"], [X11_LIBS=], "-L$x_libraries")
+  fi
   AC_SUBST(X11_LIBS)
 fi