From aef52c3501e1409b07b387da791888d0cc88b56a Mon Sep 17 00:00:00 2001 From: Gabriel Jacobo Date: Wed, 28 Aug 2013 12:43:29 -0300 Subject: [PATCH] [Linux] Test config script: Add the X11 library search path if it is not empty If ac_x_libraries is empty it means that the library's found in the default path, so we skip adding it to the XLIB variable as it screws up the search path. --- test/configure | 6 +++++- test/configure.in | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/configure b/test/configure index 30b122e4a96f9..d69cb435914b5 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 7cca1ea0f4fc9..7fb496ad6f2cf 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