Check-in [399b8095e3]
Overview
Comment:Updated to use public interface for SetStartupScript/GetStartupScript if it is found, otherwise use the old interface.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 399b8095e3d6779bca096c47fdd13bb43a3c354c
User & Date: rkeene on 2010-09-26 04:38:35
Other Links: manifest | tags
Context
2010-09-26
04:38
Added support for specifying what version of Tcl to build

Updated documentation check-in: c151e65b1d user: rkeene tags: trunk

04:38
Updated to use public interface for SetStartupScript/GetStartupScript if it is found, otherwise use the old interface. check-in: 399b8095e3 user: rkeene tags: trunk
04:38
Added patch to allow Metakit to compile under Tcl 8.6, doesn't hurt compilation on other versions of Tcl so it is applied to all check-in: 91e82d9be9 user: rkeene tags: trunk
Changes

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [ea43bce0fb] to [3b08b8978d].

18
19
20
21
22
23
24






25
26
27
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33







+
+
+
+
+
+



dnl Find archives we need to link to
DC_FIND_TCLKIT_LIBS

dnl Find the appropriate libraries to link to
AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])

dnl Determine if we have "Tcl_SetStartupScript" (8.6.x) or "TclSetStartupScriptPath" (8.4.x)
SAVE_LIBS="${LIBS}"
LIBS="${ARCHS} ${LIBS}"
AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
LIBS="${SAVE_LIBS}"

dnl Produce output
AC_OUTPUT(Makefile)

Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [56adb92a48] to [04b049978f].

174
175
176
177
178
179
180


181

182






183
184
185
186
187
188
189
174
175
176
177
178
179
180
181
182

183
184
185
186
187
188
189
190
191
192
193
194
195
196
197







+
+
-
+

+
+
+
+
+
+







    if (Tk_CreateConsoleWindow(interp) == TCL_ERROR)
        goto error;
#endif
#endif

      /* messy because TclSetStartupScriptPath is called slightly too late */
    if (Tcl_Eval(interp, initScript) == TCL_OK) {
        Tcl_Obj* path;
#ifdef HAVE_TCLSETSTARTUPSCRIPTPATH
        Tcl_Obj* path = TclGetStartupScriptPath();
        path = TclGetStartupScriptPath();
	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
#else
#  ifdef HAVE_TCL_SETSTARTUPSCRIPT
        path = Tcl_GetStartupScriptPath(NULL);
	TclSetStartupScriptPath(Tcl_GetObjResult(interp));
#  endif
#endif
	if (path == NULL)
	  Tcl_Eval(interp, "incr argc -1; set argv [lrange $argv 1 end]");
    }

    Tcl_SetVar(interp, "errorInfo", "", TCL_GLOBAL_ONLY);
    Tcl_ResetResult(interp);
    return TCL_OK;