PR5477: (continued) fix Tcl/Tk configuration to use $x11_link instead of $x11_libs

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12148 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

2 files changed, 6 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 0911076b4..3c70f3c88 100644
--- a/Makefile
+++ b/Makefile
@@ -713,6 +713,11 @@ checkstack:
 	fi
 	@rm -f tools/checkstack
 
+# Make clean in the test suite
+
+clean::
+	cd testsuite; $(MAKE) clean
+
 # Make MacOS X package
 
 package-macosx:
diff --git a/configure b/configure
index a2da90917..ecc9241e4 100755
--- a/configure
+++ b/configure
@@ -1413,7 +1413,7 @@ elif test "$x11_include" = "not found" || test "$x11_link" = "not found"; then
   has_tk=false
 else
   tk_x11_include="$x11_include"
-  tk_x11_libs="$x11_libs -lX11"
+  tk_x11_libs="$x11_link"
   has_tk=true
 fi