@@ -1,3 +1,10 @@

+chiark-tcl (1.0.1) unstable; urgency=low
+
+  * Replace #include <tcl8.3/tcl.h> with <tcl.h> and in build system find
+    Tcl version and pass appropriate -I option.  (Closes: #362806.)
+
+ --
+
 chiark-tcl (1.0.0.99.iwj.2) unstable; urgency=low

   * Provide adns txt RRs.

diff --git a/base/chiark-tcl.h b/base/chiark-tcl.h
index a8f399db9e9752781128edc1b60575843d88574f..b28c2b1f5bc963e8f1daa9d7bca88109d2a8191e 100644 (file)
--- a/base/chiark-tcl.h
+++ b/base/chiark-tcl.h
@@ -31,7 +31,9 @@
 #include <sys/un.h>
 #include <arpa/inet.h>
 
-#include <tcl8.3/tcl.h>
+#ifndef _TCL /* if someone already included some tcl.h, use that */
+#include <tcl.h>
+#endif /*_TCL*/
 
 #include <adns.h>
 

diff --git a/base/common.make b/base/common.make
index d5db198ec7288828869827489d22eb1de6df339e..6e3852a88ea180a4a6e063400dda7c31bf162305 100644 (file)
--- a/base/common.make
+++ b/base/common.make
@@ -19,6 +19,8 @@
 
 VERSION ?=     1
 FAMILY ?=      chiark_tcl
+TCL_VERSION ?= 8.3
+TCL_INCLUDEDIR ?= /usr/include/tcl$(TCL_VERSION)
 
 OPTIMISE ?=            -O2
 TCL_MEM_DEBUG ?=       -DTCL_MEM_DEBUG
@@ -33,7 +35,7 @@ endif
 
 CFLAGS +=      -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror \
                $(OPTIMISE)
-CPPFLAGS +=    -I$(BASE_DIR)
+CPPFLAGS +=    -I$(TCL_INCLUDEDIR) -I$(BASE_DIR)
 CPPFLAGS +=    $(TCL_MEM_DEBUG)
 
 AUTOS +=       $(AUTO_SRCS) $(AUTO_HDRS)

diff --git a/debian/changelog b/debian/changelog
index 3fc59f6bbd1c44d4e7890b994bcdca66198d61d1..2ccb3cb15f6d4fcb2332386e6c8c403699ec8bd5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-tcl (1.0.1) unstable; urgency=low
+
+  * Replace #include <tcl8.3/tcl.h> with <tcl.h> and in build system find
+    Tcl version and pass appropriate -I option.  (Closes: #362806.)
+
+ --
+
 chiark-tcl (1.0.0.99.iwj.2) unstable; urgency=low
 
   * Provide adns txt RRs.

diff --git a/debian/rules b/debian/rules
index 323a3f37535646472035b34a94a172f689f0e39b..013cf5230fd4f546790e601a66fb836d43db27dd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,13 +25,16 @@ libpackage=libtcl-chiark-$(majversion)
 docpackage=libtcl-chiark-$(majversion)
 docdir=usr/share/doc/$(docpackage)
 
+tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h))
+tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
+
 define checkdir
        test -f hbytes/hbytes.tct
 endef
 
 build:
        $(checkdir)
-       $(MAKE) prefix=/usr VERSION=$(majversion)
+       $(MAKE) prefix=/usr VERSION=$(majversion) TCL_VERSION=$(tclversion)
 
 clean:
        $(checkdir)