Use pkg-config to determine path of X11 library (Closes: #619344)

diff --git a/debian/control b/debian/control
index 2b490aa251f497d87af9c865852ebd40d5d91e70..7fd4d4133b3baf3ef4a5234d2566e5e9822556f8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Uploaders:
  Mehdi Dogguy <mehdi@debian.org>
 Build-Depends:
  debhelper (>= 7.1.0~),
+ pkg-config,
  autotools-dev,
  binutils-dev,
  tcl8.5-dev,

diff --git a/debian/rules b/debian/rules
index 7f78cc3cfa4aa32632e168b141b9fd506b07555e..2f6d8c50e9b15050904ca0af65db1b74cb58658e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ export OCAML_STDLIB_DIR
 CONFIGURE_OPTS := \
   --with-pthread -prefix /usr \
   -libdir $(OCAML_STDLIB_DIR) \
+  -x11lib "$(shell pkg-config --variable=libdir x11)" \
   -mandir /usr/share/man \
   -tkdefs "-I/usr/include/tcl8.5" \
   -tklibs "-L/usr/lib -ltk8.5 -ltcl8.5"