[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.2-4-47-g917819a

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 1db9b654b7d8b702cddb44df5aea1982f3120883
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Apr 16 16:15:46 2011 +0200

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

diff --git a/debian/control b/debian/control
index 2b490aa..7fd4d41 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Uploaders:
  Mehdi Dogguy <mehdi at 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 7f78cc3..2f6d8c5 100755
--- 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"

-- 
OCaml packaging