--- configure.in.bak	2005-01-11 02:22:04.841015080 -0600
+++ configure.in	2005-01-11 02:49:27.692263728 -0600
@@ -105,12 +105,18 @@
 dnl Check for XScreenSaver
 old_LIBS="$LIBS"
 old_CFLAGS="$CFLAGS"
-LIBS="$LIBS -L$x_libraries $GOSSIP_LIBS"
-CFLAGS="$CFLAGS -I$x_includes $GOSSIP_CFLAGS"
+if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
+	X_INCLUDES=-L`echo $x_includes | sed -e "s/:/ -I/g"`
+fi
+if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
+	X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+fi
+LIBS="$LIBS $X_LIBRARIES $LIBS $GOSSIP_LIBS"
+CFLAGS="$CFLAGS $X_INCLUDES $GOSSIP_CFLAGS"
 XSS_LIBS="no"
 XSS_HEADERS="no"
-AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm])
-AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries -lXss"],[],[-lX11 -lXext -lm])
+AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$X_LIBRARIES"],[],[-lX11 -lXext -lm])
+AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-L$X_LIBRARIES -lXss"],[],[-lX11 -lXext -lm])
 if test \! "$XSS_LIBS" = "no"; then
    AC_TRY_COMPILE([
 #include <X11/extensions/scrnsaver.h>