Commit aef52c3501e1409b07b387da791888d0cc88b56a
2013-08-28T12:43:29
[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.
diff --git a/test/configure b/test/configure
index 30b122e..d69cb43 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 7cca1ea..7fb496a 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