diff --git a/test/configure b/test/configure
index 30b122e4a..d69cb4359 100755
--- a/test/configure
+++ b/test/configure
@@ -3794,7 +3794,11 @@ if test x$have_x = xyes; then
         :
     else
         XPATH="-L$ac_x_libraries"
-        XLIB="-lX11"
+        if test "x$ac_x_libraries" = x; then
+            XLIB="-lX11"
+        else
+            XLIB="-L$ac_x_libraries -lX11"
+        fi
     fi
 fi
 
diff --git a/test/configure.in b/test/configure.in
index 7cca1ea0f..7fb496ad6 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -100,7 +100,11 @@ if test x$have_x = xyes; then
         :
     else
         XPATH="-L$ac_x_libraries"
-        XLIB="-lX11"
+        if test "x$ac_x_libraries" = x; then
+            XLIB="-lX11"
+        else
+            XLIB="-L$ac_x_libraries -lX11"
+        fi
     fi
 fi