From 7ea355421e25c91dd46235f49246c6a21bdeae2b Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Sat, 26 Aug 2006 10:52:44 +0200
Subject: fix FTBFS because of X11

---
 configure    | 6 +++++-
 configure.in | 1 +
 drivers.m4   | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index e87748c..caea080 100755
--- a/configure
+++ b/configure
@@ -8120,7 +8120,11 @@ echo "$as_me: WARNING: X11 headers or libraries not available: X11 driver disabl
    else
       GRAPHIC="yes"
       DRIVERS="$DRIVERS drv_X11.o"
-      DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
+      if test "x$ac_x_libraries" = "x"; then
+	DRVLIBS="$DRVLIBS -lX11"
+      else
+        DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
+      fi
       CPP_FLAGS="$CPPFLAGS $X_CFLAGS"
 
 cat >>confdefs.h <<\_ACEOF
diff --git a/configure.in b/configure.in
index ca233da..17dd4c5 100644
--- a/configure.in
+++ b/configure.in
@@ -46,6 +46,7 @@ sinclude(curses.m4)
 AC_CHECK_CURSES
 
 # Checks for X11
+AC_PATH_X
 AC_PATH_XTRA
 # double-check for X11
 if test "$no_x" != "yes"; then
diff --git a/drivers.m4 b/drivers.m4
index 514230d..3b3b1d2 100644
--- a/drivers.m4
+++ b/drivers.m4
@@ -467,7 +467,11 @@ if test "$X11" = "yes"; then
    else
       GRAPHIC="yes"
       DRIVERS="$DRIVERS drv_X11.o"
-      DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
+      if test "x$ac_x_libraries" = "x"; then
+	DRVLIBS="$DRVLIBS -lX11"
+      else
+        DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
+      fi
       CPP_FLAGS="$CPPFLAGS $X_CFLAGS" 
       AC_DEFINE(WITH_X11, 1, [X11 driver])
    fi
-- 
cgit v1.2.3