Replace outdated convenience copy of Tcl with system provided one

.travis.yml

@@ -15,6 +15,7 @@ addons:
       - libxmu-dev
       - libxpm-dev
       - xaw3dg-dev
+      - tcl-dev
       - iraf-dev
       - xauth
       - xvfb

X11IRAF.tmpl

@@ -73,7 +73,7 @@
 
 /* Libraries: */
 #ifndef LibObm
-#define LibObm 		-lobm
+#define LibObm 		-lobm -ltcl
 #endif
 #ifndef LibXpm
 #define LibXpm 		-lXpm

obm/Imakefile

@@ -20,16 +20,16 @@ X11IRAFDIR = ../
      ARADD = ar rul
 #endif
 
-        LIBDIRS = Tcl ObmW
+        LIBDIRS = ObmW
         SUBDIRS = $(LIBDIRS)
 
         HEADERS = Obm.h ObmP.h widget.h
            SRCS = Obm.c client.c param.c server.c widget.c gterm.c marker.c \
 		    html.c geom.c
            OBJS = Obm.o client.o param.o server.o widget.o gterm.o marker.o \
 		    html.o geom.o
-       ALL_OBJS = Tcl/[A-Za-z]*.o ObmW/[A-Za-z]*.o $(OBJS)
-       ALL_DONE = Tcl/DONE ObmW/DONE
+       ALL_OBJS = ObmW/[A-Za-z]*.o $(OBJS)
+       ALL_DONE = ObmW/DONE
          RESOBJ = obmres.o
 
 all::	libobm.a
@@ -48,7 +48,6 @@ World:
 
 libobm.a: $(LIBDIRS) $(ALL_DONE) $(OBJS)
 	$(RM) $@
-	@(cd Tcl;  $(MAKE) $(MFLAGS) all X11IRAFDIR=../../)
 	@(cd ObmW; $(MAKE) $(MFLAGS) all X11IRAFDIR=../../)
 	$(AR) $@ $(OBJS)
 	$(ARADD) $@ $(ALL_OBJS)

obm/Obm.c

@@ -94,6 +94,32 @@
 static void obm_call_activate_callbacks();
 
 
+#if (TCL_MAJOR_VERSION < 8)
+#error Tcl 8 or higher is required
+#endif
+
+/* Backward compatibility patch for errorLine access. These functions were
+ * introduced only in Tcl 8.6, and direct access to errorLine is deprecated
+ * since then.
+ */
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
+char *
+Tcl_GetErrorLine(tcl)
+Tcl_Interp *tcl;
+{
+	return tcl->errorLine;
+}
+
+void
+Tcl_SetErrorLine(tcl, s)
+Tcl_Interp *tcl;
+char *s;
+{
+	tcl->errorLine = s;
+}
+#endif
+
+
 /* ObmOpen -- Open the object manager.
  */
 ObmContext
@@ -377,8 +403,8 @@ int state;
 		if (status != TCL_OK) {
 		    char *errstr = Tcl_GetVar (obm->tcl, "errorInfo", 0);
 		    fprintf (stderr, "Error on line %d in activate: %s\n",
-			obm->tcl->errorLine,
-			errstr ? errstr : obm->tcl->result);
+			Tcl_GetErrorLine (obm->tcl),
+			errstr ? errstr : Tcl_GetStringResult (obm->tcl));
 		}
 	    }
 }
@@ -458,8 +484,8 @@ char *message;
 		if (status != TCL_OK) {
 		    char *errstr = Tcl_GetVar (obm->tcl, "errorInfo", 0);
 		    fprintf (stderr, "Error in message to %s, line %d: %s\n",
-			object, obm->tcl->errorLine,
-			errstr ? errstr : obm->tcl->result);
+			object, Tcl_GetErrorLine (obm->tcl),
+			     errstr ? errstr : Tcl_GetStringResult (obm->tcl));
 		}
 	    } else
 		status = TCL_OK;

obm/ObmP.h

@@ -65,7 +65,7 @@
 #include <X11/Xraw/Table.h>
 
 #include <X11/xpm.h>
-#include <Tcl/tcl.h>
+#include <tcl/tcl.h>
 
 /* Size limiting definitions. */
 #define SZ_NAME		128		/* class or object name */