Index: ChangeLog
==================================================================
--- ChangeLog
+++ ChangeLog
@@ -1,6 +1,10 @@
 
+2000-12-08  Johannes Zellner  <johannes@zellner.org>
+
+    * reenabled wishrl and tclshrl via configure switches
+
 2000-11-19  Johannes Zellner  <johannes@zellner.org>
 
     * configure.in: moved the tlib check before the libreadline check
 
 2000-09-20  Johannes Zellner <johannes@zellner.org>

Index: Makefile.am
==================================================================
--- Makefile.am
+++ Makefile.am
@@ -1,8 +1,8 @@
 ## -*- automake -*-
 ## FILE: "/home/joze/src/tclreadline/Makefile.am"
-## LAST MODIFICATION: "Mit, 20 Sep 2000 16:25:22 +0200 (joze)"
+## LAST MODIFICATION: "Fre, 08 Dez 2000 01:34:51 +0100 (joze)"
 ## (C) 2000 by Johannes Zellner, <johannes@zellner.org>
 ## $Id$
 ## ---
 ## tclreadline -- gnu readline for tcl
 ## http://www.zellner.org/tclreadline/
@@ -34,7 +34,23 @@
     aux/ltconfig             \
     aux/ltmain.sh            \
     aux/missing              \
     aux/mkinstalldirs
 
+if STATIC_TCLSHRL
+static_tclshrl = tclshrl
+tclshrl_SOURCES = tclshrl.c
+tclshrl_LDADD = libtclreadline.la $(TCL_LIB_SPEC)
+tclshrl_LDFLAGS = -static
+endif
+
+if STATIC_WISHRL
+static_wishrl = wishrl
+wishrl_SOURCES = wishrl.c
+wishrl_LDADD = libtclreadline.la $(TCL_LIB_SPEC) $(TK_LIB_SPEC)
+wishrl_LDFLAGS = -static
+endif
+
+bin_PROGRAMS = $(static_tclshrl) $(static_wishrl)
+
 man_MANS = tclreadline.n
 

Index: README
==================================================================
--- README
+++ README
@@ -1,7 +1,7 @@
-FILE: "/disk01/home/joze/src/tclreadline/README"
-LAST MODIFICATION: "Sun, 02 Jul 2000 00:24:48 +0200 (joze)"
+FILE: "/home/joze/src/tclreadline/README"
+LAST MODIFICATION: "Fre, 08 Dez 2000 01:42:39 +0100 (joze)"
 (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
 $Id$
 ---
 
 tclreadline -- gnu readline for tcl
@@ -46,29 +46,24 @@
         tclreadline uses the gnu readline callback handler, which
         wasn't implemented in early releases.
 
     (c) The usual ./configure; make; make install sequence should do the rest.
 
-####### DISABLED ########
     (d) Optionally (or additionally) you can build the executables
         tclshrl and / or wishrl which are a readline enhanced replacement
         for tclsh and wish. To compile these executable you should type
-            make tclshrl
-        or
-            make wishrl
-        or
-            make shells
-        the latter will compile both shells. To install these shells
-        you should type
-            make install-tclshrl
-        or
-            make install-wishrl
-        or
-            make install-shells
-        Building these executables is discouraged but necessary
-        on systems which don't support shared libs.
-####### DISABLED ########
+
+	    ./configure --enable-tclshrl --enable-wishrl
+
+	(or one of these if you want just tclshrl or wishrl).
+	NOTE that these executables need an installed version of
+	tclreadline because they need some script files to run
+	so you can't test tclshrl/wishrl before installing
+	the tclreadline scripts.
+
+        Building statically linked executables is DISCOURAGED
+	but necessary on systems which don't support shared libs.
 
 
 4. Using tclreadline for interactive tcl scripting.
 ---------------------------------------------------
 

Index: configure.in
==================================================================
--- configure.in
+++ configure.in
@@ -1,8 +1,8 @@
 dnl -*- autoconf -*-
 dnl FILE: "/home/joze/src/tclreadline/configure.in"
-dnl LAST MODIFICATION: "Son, 19 Nov 2000 14:58:20 +0100 (joze)"
+dnl LAST MODIFICATION: "Fre, 08 Dez 2000 01:36:25 +0100 (joze)"
 dnl (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
 dnl $Id$
 dnl ---
 dnl tclreadline -- gnu readline for tcl
 dnl http://www.zellner.org/tclreadline/
@@ -14,12 +14,12 @@
 AC_PREREQ(2.13)
 AC_REVISION($Revision$)
 AC_CONFIG_AUX_DIR(./aux)
 
 MAJOR=2
-MINOR=0
-PATCHLEVEL=5
+MINOR=1
+PATCHLEVEL=0
 VERSION=$MAJOR.$MINOR
 PATCHLEVEL_STR=$VERSION.$PATCHLEVEL
 
 AC_SUBST(MAJOR)
 AC_SUBST(MINOR)
@@ -233,9 +233,46 @@
     AC_MSG_RESULT($READLINE_VERSION),
     AC_MSG_RESULT(failed),
     AC_MSG_RESULT(no cross compiling)
 )
 
+
+AC_ARG_ENABLE(tclshrl,
+    [  --enable-tclshrl        build statically linked tclshrl],
+    [dnl action if given
+	case "${enableval}" in
+	    yes) enable_static=true ;;
+	    no)  enable_static=false ;;
+	    *)   AC_MSG_ERROR(bad value ${enableval} for --enable-static) ;;
+	esac
+    ],
+    [dnl action if not given
+	enable_static=false
+    ]
+)
+AM_CONDITIONAL(STATIC_TCLSHRL, test x$enable_static = xtrue)
+
+AC_ARG_ENABLE(wishrl,
+    [  --enable-wishrl         build statically linked wishrl],
+    [dnl action if given
+	case "${enableval}" in
+	    yes)
+		enable_static=true
+		dnl source the tkConfig.sh which defines TK_LIB_SPEC
+		. $TCL_LIB_DIR/tkConfig.sh
+		AC_SUBST(TK_LIB_SPEC)
+	    ;;
+	    no)  enable_static=false ;;
+	    *)   AC_MSG_ERROR(bad value ${enableval} for --enable-static) ;;
+	esac
+    ],
+    [dnl action if not given
+	enable_static=false
+    ]
+)
+AM_CONDITIONAL(STATIC_WISHRL, test x$enable_static = xtrue)
+
 
 AC_SUBST(TCL_INCLUDE_DIR)
+AC_SUBST(TCL_LIB_SPEC)
 AC_SUBST(READLINE_INCLUDE_DIR)
 AC_OUTPUT(Makefile tclreadline.h tclreadlineInit.tcl tclreadlineSetup.tcl tclreadline.n pkgIndex.tcl)