--- configure.ac	2001-04-10 11:36:09.000000000 -0600
+++ configure.ac	2005-03-19 08:40:56.377832328 -0700
@@ -20,8 +20,22 @@
               AC_DEFINE(ENABLE_CONSOLE))
 
 AC_ARG_ENABLE(X, [  --disable-X             do not compile in X features],
-              if test $enableval != no; then AC_DEFINE(ENABLE_X) export xstuff="-L$x_libraries -lX11"; fi,
-              AC_DEFINE(ENABLE_X) export X_Stuff="-L$x_libraries -lX11")
+              if test $enableval != no; then AC_DEFINE(ENABLE_X) 
+	        if test -n "$x_libraries";
+	        then
+	         export xstuff="-L$x_libraries -lX11"
+	        else
+	         export xstuff="-lX11"
+	        fi
+	       fi
+	       ,
+              AC_DEFINE(ENABLE_X) 
+	      if test -n "$x_libraries";
+	      then
+	       export X_Stuff="-L$x_libraries -lX11"
+	      else
+	       export X_Stuff="-lX11"
+	      fi)
 
 AC_SUBST(X_Stuff)
 AC_SUBST(x_headers)