Check-in [d9a3eefbfc]
Not logged in
Overview
SHA1:d9a3eefbfcd5e47f3ef0da8c4855afefc1b8c13e
Date: 2000-12-08 00:45:45
User: johannes@zellner.org
Comment: * reenabled wishrl and tclshrl via configure switches
Timelines: family | ancestors | descendants | both | trunk | tclreadline-2-1-0
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2000-12-08
00:50
[7695f3855b] Fri Dec 8 01:50:05 CET 2000 (user: johannes@zellner.org, tags: trunk, tclreadline-2-1-0a)
00:45
[d9a3eefbfc] * reenabled wishrl and tclshrl via configure switches (user: johannes@zellner.org, tags: trunk, tclreadline-2-1-0)
2000-11-19
14:13
[769067ae30] * configure.in: moved the tlib check before the libreadline check (user: johannes@zellner.org, tags: trunk)
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified ChangeLog from [6c08b01ee3] to [c4a5fe325f].

     1      1   
            2  +2000-12-08  Johannes Zellner  <johannes@zellner.org>
            3  +
            4  +    * reenabled wishrl and tclshrl via configure switches
            5  +
     2      6   2000-11-19  Johannes Zellner  <johannes@zellner.org>
     3      7   
     4      8       * configure.in: moved the tlib check before the libreadline check
     5      9   
     6     10   2000-09-20  Johannes Zellner <johannes@zellner.org>
     7     11   
     8     12       * made tclreadline.h installing to ${prefix}/include

Modified Makefile.am from [69d8b6511b] to [b2c462c121].

     1      1   ## -*- automake -*-
     2      2   ## FILE: "/home/joze/src/tclreadline/Makefile.am"
     3         -## LAST MODIFICATION: "Mit, 20 Sep 2000 16:25:22 +0200 (joze)"
            3  +## LAST MODIFICATION: "Fre, 08 Dez 2000 01:34:51 +0100 (joze)"
     4      4   ## (C) 2000 by Johannes Zellner, <johannes@zellner.org>
     5      5   ## $Id$
     6      6   ## ---
     7      7   ## tclreadline -- gnu readline for tcl
     8      8   ## http://www.zellner.org/tclreadline/
     9      9   ## Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
    10     10   ## This software is copyright under the BSD license.
................................................................................
    32     32       aux/config.sub           \
    33     33       aux/install-sh           \
    34     34       aux/ltconfig             \
    35     35       aux/ltmain.sh            \
    36     36       aux/missing              \
    37     37       aux/mkinstalldirs
    38     38   
           39  +if STATIC_TCLSHRL
           40  +static_tclshrl = tclshrl
           41  +tclshrl_SOURCES = tclshrl.c
           42  +tclshrl_LDADD = libtclreadline.la $(TCL_LIB_SPEC)
           43  +tclshrl_LDFLAGS = -static
           44  +endif
           45  +
           46  +if STATIC_WISHRL
           47  +static_wishrl = wishrl
           48  +wishrl_SOURCES = wishrl.c
           49  +wishrl_LDADD = libtclreadline.la $(TCL_LIB_SPEC) $(TK_LIB_SPEC)
           50  +wishrl_LDFLAGS = -static
           51  +endif
           52  +
           53  +bin_PROGRAMS = $(static_tclshrl) $(static_wishrl)
           54  +
    39     55   man_MANS = tclreadline.n
    40     56   

Modified README from [2cef1bc23a] to [2a7d2b63a9].

     1         -FILE: "/disk01/home/joze/src/tclreadline/README"
     2         -LAST MODIFICATION: "Sun, 02 Jul 2000 00:24:48 +0200 (joze)"
            1  +FILE: "/home/joze/src/tclreadline/README"
            2  +LAST MODIFICATION: "Fre, 08 Dez 2000 01:42:39 +0100 (joze)"
     3      3   (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
     4      4   $Id$
     5      5   ---
     6      6   
     7      7   tclreadline -- gnu readline for tcl
     8      8   http://www.zellner.org/tclreadline/
     9      9   Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
................................................................................
    44     44   
    45     45       (b) Make sure you have gnu readline 2.2 or higher.
    46     46           tclreadline uses the gnu readline callback handler, which
    47     47           wasn't implemented in early releases.
    48     48   
    49     49       (c) The usual ./configure; make; make install sequence should do the rest.
    50     50   
    51         -####### DISABLED ########
    52     51       (d) Optionally (or additionally) you can build the executables
    53     52           tclshrl and / or wishrl which are a readline enhanced replacement
    54     53           for tclsh and wish. To compile these executable you should type
    55         -            make tclshrl
    56         -        or
    57         -            make wishrl
    58         -        or
    59         -            make shells
    60         -        the latter will compile both shells. To install these shells
    61         -        you should type
    62         -            make install-tclshrl
    63         -        or
    64         -            make install-wishrl
    65         -        or
    66         -            make install-shells
    67         -        Building these executables is discouraged but necessary
    68         -        on systems which don't support shared libs.
    69         -####### DISABLED ########
           54  +
           55  +	    ./configure --enable-tclshrl --enable-wishrl
           56  +
           57  +	(or one of these if you want just tclshrl or wishrl).
           58  +	NOTE that these executables need an installed version of
           59  +	tclreadline because they need some script files to run
           60  +	so you can't test tclshrl/wishrl before installing
           61  +	the tclreadline scripts.
           62  +
           63  +        Building statically linked executables is DISCOURAGED
           64  +	but necessary on systems which don't support shared libs.
    70     65   
    71     66   
    72     67   4. Using tclreadline for interactive tcl scripting.
    73     68   ---------------------------------------------------
    74     69   
    75     70   copy the sample.tclshrc to $HOME/.tclshrc. If you use another interpreter
    76     71   like wish, you should copy the file sample.tclshrc to $HOME/.wishrc

Modified configure.in from [aba8bc33bd] to [2b68a6ef3d].

     1      1   dnl -*- autoconf -*-
     2      2   dnl FILE: "/home/joze/src/tclreadline/configure.in"
     3         -dnl LAST MODIFICATION: "Son, 19 Nov 2000 14:58:20 +0100 (joze)"
            3  +dnl LAST MODIFICATION: "Fre, 08 Dez 2000 01:36:25 +0100 (joze)"
     4      4   dnl (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
     5      5   dnl $Id$
     6      6   dnl ---
     7      7   dnl tclreadline -- gnu readline for tcl
     8      8   dnl http://www.zellner.org/tclreadline/
     9      9   dnl Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
    10     10   dnl This software is copyright under the BSD license.
................................................................................
    12     12   AC_INIT(tclreadline.c)
    13     13   AM_CONFIG_HEADER(config.h)
    14     14   AC_PREREQ(2.13)
    15     15   AC_REVISION($Revision$)
    16     16   AC_CONFIG_AUX_DIR(./aux)
    17     17   
    18     18   MAJOR=2
    19         -MINOR=0
    20         -PATCHLEVEL=5
           19  +MINOR=1
           20  +PATCHLEVEL=0
    21     21   VERSION=$MAJOR.$MINOR
    22     22   PATCHLEVEL_STR=$VERSION.$PATCHLEVEL
    23     23   
    24     24   AC_SUBST(MAJOR)
    25     25   AC_SUBST(MINOR)
    26     26   AC_SUBST(PATCHLEVEL)
    27     27   AC_SUBST(VERSION)
................................................................................
   231    231   }],
   232    232       READLINE_VERSION=`cat conftestversion`
   233    233       AC_MSG_RESULT($READLINE_VERSION),
   234    234       AC_MSG_RESULT(failed),
   235    235       AC_MSG_RESULT(no cross compiling)
   236    236   )
   237    237   
          238  +
          239  +AC_ARG_ENABLE(tclshrl,
          240  +    [  --enable-tclshrl        build statically linked tclshrl],
          241  +    [dnl action if given
          242  +	case "${enableval}" in
          243  +	    yes) enable_static=true ;;
          244  +	    no)  enable_static=false ;;
          245  +	    *)   AC_MSG_ERROR(bad value ${enableval} for --enable-static) ;;
          246  +	esac
          247  +    ],
          248  +    [dnl action if not given
          249  +	enable_static=false
          250  +    ]
          251  +)
          252  +AM_CONDITIONAL(STATIC_TCLSHRL, test x$enable_static = xtrue)
          253  +
          254  +AC_ARG_ENABLE(wishrl,
          255  +    [  --enable-wishrl         build statically linked wishrl],
          256  +    [dnl action if given
          257  +	case "${enableval}" in
          258  +	    yes)
          259  +		enable_static=true
          260  +		dnl source the tkConfig.sh which defines TK_LIB_SPEC
          261  +		. $TCL_LIB_DIR/tkConfig.sh
          262  +		AC_SUBST(TK_LIB_SPEC)
          263  +	    ;;
          264  +	    no)  enable_static=false ;;
          265  +	    *)   AC_MSG_ERROR(bad value ${enableval} for --enable-static) ;;
          266  +	esac
          267  +    ],
          268  +    [dnl action if not given
          269  +	enable_static=false
          270  +    ]
          271  +)
          272  +AM_CONDITIONAL(STATIC_WISHRL, test x$enable_static = xtrue)
          273  +
   238    274   
   239    275   AC_SUBST(TCL_INCLUDE_DIR)
          276  +AC_SUBST(TCL_LIB_SPEC)
   240    277   AC_SUBST(READLINE_INCLUDE_DIR)
   241    278   AC_OUTPUT(Makefile tclreadline.h tclreadlineInit.tcl tclreadlineSetup.tcl tclreadline.n pkgIndex.tcl)