Check-in [21ee93bcbd]
Not logged in
Overview
Comment: config.h.in configure.in tclreadline.c tclreadlineSetup.tcl.in
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 21ee93bcbd5629fe310e8a36d997c7139c3ec2af
User & Date: johannes@zellner.org on 1999-09-19 23:49:07
Other Links: manifest | tags
Context
1999-09-19
23:58
configure.in check-in: c5d46281e7 user: johannes@zellner.org tags: trunk
23:49
config.h.in configure.in tclreadline.c tclreadlineSetup.tcl.in check-in: 21ee93bcbd user: johannes@zellner.org tags: trunk
23:27
configure.in tclreadline.c check-in: 4b7e7ab8e4 user: johannes@zellner.org tags: trunk
Changes

Modified config.h.in from [79c57abe6e] to [2aa2f18478].

1
2
3
4
5
6
7
8
9
10
11
12

 /* ==================================================================
   
    FILE: "/diska/home/joze/src/tclreadline/config.h.in"
    LAST MODIFICATION: "Mon Sep 13 17:51:29 1999 (joze)"
    (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
    $Id$
    vim:set ft=c:
    ---

    tclreadline -- gnu readline for tcl
    Copyright (C) 1999  Johannes Zellner



|
|







1
2
3
4
5
6
7
8
9
10
11
12

 /* ==================================================================
   
    FILE: "/home/joze/src/tclreadline/config.h.in"
    LAST MODIFICATION: "Mon Sep 20 01:31:18 1999 (joze)"
    (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
    $Id$
    vim:set ft=c:
    ---

    tclreadline -- gnu readline for tcl
    Copyright (C) 1999  Johannes Zellner
28
29
30
31
32
33
34


    johannes@zellner.org
    http://www.zellner.org/tclreadline/

    ================================================================== */  


#undef EXECUTING_MACRO_HACK









>
>
28
29
30
31
32
33
34
35
36
    johannes@zellner.org
    http://www.zellner.org/tclreadline/

    ================================================================== */  


#undef EXECUTING_MACRO_HACK

#undef CLEANUP_AFER_SIGNAL

Modified configure.in from [32372d11e8] to [20b5590ffc].

1
2
3
4
5
6
7
8
9
10
# -*- autoconf -*-
# FILE: "/disk01/home/joze/src/tclreadline/configure.in"
# LAST MODIFICATION: "Mon Sep 20 01:20:59 1999 (joze)"
# (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
# $Id$
# ---
#
# tclreadline -- gnu readline for tcl
# Copyright (C) 1999  Johannes Zellner
#

|
|







1
2
3
4
5
6
7
8
9
10
# -*- autoconf -*-
# FILE: "/home/joze/src/tclreadline/configure.in"
# LAST MODIFICATION: "Mon Sep 20 01:44:59 1999 (joze)"
# (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
# $Id$
# ---
#
# tclreadline -- gnu readline for tcl
# Copyright (C) 1999  Johannes Zellner
#
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
#endif
main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }],
			res="OK", res="FAIL", res="FAIL")
				if test "$res" = "OK"; then
					TERMLIB_DIR=-L${dir}
					if test "`(uname) 2>/dev/null`" = SunOS &&
						uname -r | grep '^5' >/dev/null; then
						TERMLIB_DIR="$TERMLIB_DIR -R ${dir}"
					fi
					TERMLIB=-l${tlib}
					break
				fi
			done
			if test "x${TERMLIB_DIR}" = "x"; then
				AC_MSG_RESULT(none of $libname is usable)







|







374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
#endif
main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }],
			res="OK", res="FAIL", res="FAIL")
				if test "$res" = "OK"; then
					TERMLIB_DIR=-L${dir}
					if test "`(uname) 2>/dev/null`" = SunOS &&
						uname -r | grep '^5' >/dev/null; then
						TERMLIB_DIR_R="${TERMLIB_DIR} -R${dir}"
					fi
					TERMLIB=-l${tlib}
					break
				fi
			done
			if test "x${TERMLIB_DIR}" = "x"; then
				AC_MSG_RESULT(none of $libname is usable)
428
429
430
431
432
433
434












435
436
437
438
439
440
441
extern char* _rl_executing_macro;
int main () {
    _rl_executing_macro = (char*) 0;
    return 0;
}],
    AC_MSG_RESULT(yes); AC_DEFINE_UNQUOTED(EXECUTING_MACRO_HACK, 1),
    AC_MSG_RESULT(no))














AC_MSG_CHECKING([for the readline version number])
AC_TRY_RUN([
#include <stdio.h>
int main () {
    FILE *fp = fopen("conftestversion", "w");







>
>
>
>
>
>
>
>
>
>
>
>







428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
extern char* _rl_executing_macro;
int main () {
    _rl_executing_macro = (char*) 0;
    return 0;
}],
    AC_MSG_RESULT(yes); AC_DEFINE_UNQUOTED(EXECUTING_MACRO_HACK, 1),
    AC_MSG_RESULT(no))

# check for readline's rl_cleanup_after_signal

AC_MSG_CHECKING([for rl_cleanup_after_signal() in -lreadline])
AC_TRY_LINK(,[
extern void rl_cleanup_after_signal();
int main () {
    rl_cleanup_after_signal();
    return 0;
}],
    AC_MSG_RESULT(yes); AC_DEFINE_UNQUOTED(CLEANUP_AFER_SIGNAL, 1),
    AC_MSG_RESULT(no))


AC_MSG_CHECKING([for the readline version number])
AC_TRY_RUN([
#include <stdio.h>
int main () {
    FILE *fp = fopen("conftestversion", "w");

Modified tclreadline.c from [8b36fd5d73] to [448ae7324b].

1
2
3
4
5
6
7
8
9
10
11
12

 /* ==================================================================

    FILE: "/disk01/home/joze/src/tclreadline/tclreadline.c"
    LAST MODIFICATION: "Mon Sep 20 01:23:39 1999 (joze)"
    (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
    $Id$
    ---

    tclreadline -- gnu readline for tcl
    Copyright (C) 1999  Johannes Zellner




|
|







1
2
3
4
5
6
7
8
9
10
11
12

 /* ==================================================================

    FILE: "/home/joze/src/tclreadline/tclreadline.c"
    LAST MODIFICATION: "Mon Sep 20 01:35:18 1999 (joze)"
    (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
    $Id$
    ---

    tclreadline -- gnu readline for tcl
    Copyright (C) 1999  Johannes Zellner

373
374
375
376
377
378
379

380
381
382
383
384
385
386
387

388
389

390
391
392
393
394
395
396
            break;

        case TCLRL_RESET_TERMINAL:
			/* TODO: add this to the completer */
            if (argc > 3) {
                Tcl_WrongNumArgs(interp, 2, objv, "?terminal-name?");
                return TCL_ERROR;

            } else if (3 == argc) {
				/*
				 * - tcl8.0 doesn't have Tcl_GetString()
				 * - rl_reset_terminal() might be defined
				 *   to take no arguments. This might produce
				 *   a compiler warning.
				 */
				rl_reset_terminal(Tcl_GetStringFromObj(objv[2], (int*) NULL));

            } else {
				rl_cleanup_after_signal();

			}
            break;

        default:
            goto BAD_COMMAND;
            /* NOTREACHED */
            break;







>
|







>


>







373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
            break;

        case TCLRL_RESET_TERMINAL:
			/* TODO: add this to the completer */
            if (argc > 3) {
                Tcl_WrongNumArgs(interp, 2, objv, "?terminal-name?");
                return TCL_ERROR;
			}
            if (3 == argc) {
				/*
				 * - tcl8.0 doesn't have Tcl_GetString()
				 * - rl_reset_terminal() might be defined
				 *   to take no arguments. This might produce
				 *   a compiler warning.
				 */
				rl_reset_terminal(Tcl_GetStringFromObj(objv[2], (int*) NULL));
#ifdef CLEANUP_AFER_SIGNAL
            } else {
				rl_cleanup_after_signal();
#endif
			}
            break;

        default:
            goto BAD_COMMAND;
            /* NOTREACHED */
            break;

Modified tclreadlineSetup.tcl.in from [3563bc89b4] to [e794a68b50].

1
2
3
4
5
6
7
8
9
10
#!/usr/locanl/bin/tclsh
# FILE: "/home/joze/src/tclreadline/tclreadlineSetup.tcl.in"
# LAST MODIFICATION: "Sun Sep 19 22:42:13 1999 (joze)"
# (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
# $Id$
# ---
#
# tclreadline -- gnu readline for tcl
# Copyright (C) 1999  Johannes Zellner
#


|







1
2
3
4
5
6
7
8
9
10
#!/usr/locanl/bin/tclsh
# FILE: "/home/joze/src/tclreadline/tclreadlineSetup.tcl.in"
# LAST MODIFICATION: "Mon Sep 20 01:34:31 1999 (joze)"
# (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
# $Id$
# ---
#
# tclreadline -- gnu readline for tcl
# Copyright (C) 1999  Johannes Zellner
#
201
202
203
204
205
206
207





208
209
210
211
212
213
214
				if {[catch {
					::tclreadline::readline write \
					[::tclreadline::HistoryFileGet]
				} ::tclreadline::errorMsg]} {
					puts stderr $::tclreadline::errorMsg
				}






				::tclreadline::readline reset-terminal

				if [catch "eval ::tclreadline::Exit $args" message] {
					puts stderr "error:"
					puts stderr "$message"
				}
				# NOTREACHED







>
>
>
>
>







201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
				if {[catch {
					::tclreadline::readline write \
					[::tclreadline::HistoryFileGet]
				} ::tclreadline::errorMsg]} {
					puts stderr $::tclreadline::errorMsg
				}

				# this call is ignored, if tclreadline.c
				# was compiled with CLEANUP_AFER_SIGNAL
				# not defined. This is the case for
				# older versions of libreadline.
				#
				::tclreadline::readline reset-terminal

				if [catch "eval ::tclreadline::Exit $args" message] {
					puts stderr "error:"
					puts stderr "$message"
				}
				# NOTREACHED