[SCM] Render HTML and CSS content with tk branch, debian, updated. 2975cb69e7741150f04952c14616bf4efe27d85e

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 2975cb69e7741150f04952c14616bf4efe27d85e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Nov 5 12:13:04 2012 +0100

    Configure shared libs for hurd-i386 and kfreeBSD-*. Closes: #692301

diff --git a/debian/changelog b/debian/changelog
index 1f53a23..9ee7323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tk-html3 (3.0~fossil20110109-2) unstable; urgency=low
+
+  * Configure shared libs for hurd-i386 and kfreeBSD-*. Closes: #692301
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 05 Nov 2012 11:39:11 +0100
+
 tk-html3 (3.0~fossil20110109-1) unstable; urgency=low
 
   * Initial release. (Closes: #659344)
diff --git a/debian/patches/configure_shlibs.patch b/debian/patches/configure_shlibs.patch
new file mode 100644
index 0000000..134a0bc
--- /dev/null
+++ b/debian/patches/configure_shlibs.patch
@@ -0,0 +1,30 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Configure shared libs for hurd-i386 and kfreeBSD-* correctly.
+Bug-Debian: http://bugs.debian.org/692301
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -1469,13 +1469,13 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    fi
+ 
+ 	    ;;
+-	GNU*)
++	GNU-*)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+ 
+ 	    SHLIB_LD="${CC} -shared"
+-	    DL_OBJS=""
++	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    CC_SEARCH_FLAGS=""
+@@ -1576,7 +1576,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|GNU/kFreeBSD*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="ld -Bshareable -x"
diff --git a/debian/patches/series b/debian/patches/series
index 32aef48..a87f41e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ disable_bugreport.patch
 updated_bookmarks.patch
 ds9.patch
 use_tcllib.patch
+configure_shlibs.patch

-- 
Render HTML and CSS content with tk