Index: COPYING ================================================================== --- COPYING +++ COPYING @@ -1,7 +1,7 @@ - Copyright (c) 1998 - 2000, Johannes Zellner + Copyright (c) 1998 - 2001, Johannes Zellner All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Index: ChangeLog ================================================================== --- ChangeLog +++ ChangeLog @@ -1,5 +1,8 @@ +2001-01-10 Johannes Zellner + + * configure.in: changed the check for readline/readline.h / readline.h 2000-12-08 Johannes Zellner * reordered Makefile.am so that it always includes tclshrl.c,wishrl.c into the distribution. Index: Makefile.am ================================================================== --- Makefile.am +++ Makefile.am @@ -1,14 +1,14 @@ ## -*- automake -*- ## FILE: "/home/joze/src/tclreadline/Makefile.am" -## LAST MODIFICATION: "Fre, 08 Dez 2000 01:47:52 +0100 (joze)" -## (C) 2000 by Johannes Zellner, +## LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)" +## (C) 2000 - 2001 by Johannes Zellner, ## $Id$ ## --- ## tclreadline -- gnu readline for tcl ## http://www.zellner.org/tclreadline/ -## Copyright (c) 1998 - 2000, Johannes Zellner +## Copyright (c) 1998 - 2001, Johannes Zellner ## This software is copyright under the BSD license. ## --- ## AUTOMAKE_OPTIONS = foreign Index: README ================================================================== --- README +++ README @@ -1,14 +1,14 @@ FILE: "/home/joze/src/tclreadline/README" -LAST MODIFICATION: "Fre, 08 Dez 2000 01:42:39 +0100 (joze)" -(C) 1998 - 2000 by Johannes Zellner, +LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)" +(C) 1998 - 2001 by Johannes Zellner, $Id$ --- tclreadline -- gnu readline for tcl http://www.zellner.org/tclreadline/ -Copyright (c) 1998 - 2000, Johannes Zellner +Copyright (c) 1998 - 2001, Johannes Zellner This software is copyright under the BSD license. tclreadline Index: autogen.sh ================================================================== --- autogen.sh +++ autogen.sh @@ -1,9 +1,9 @@ #!/bin/sh -# FILE: "/disk01/home/joze/src/tclreadline/autogen.sh" -# LAST MODIFICATION: "Sun, 02 Jul 2000 00:20:33 +0200 (joze)" -# (C) 2000 by Johannes Zellner, +# FILE: "/home/joze/src/tclreadline/autogen.sh" +# LAST MODIFICATION: "Mit, 10 Jan 2001 06:28:43 +0100 (joze)" +# (C) 2000 - 2001 by Johannes Zellner, # $Id$ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. Index: configure.in ================================================================== --- configure.in +++ configure.in @@ -1,14 +1,14 @@ dnl -*- autoconf -*- dnl FILE: "/home/joze/src/tclreadline/configure.in" -dnl LAST MODIFICATION: "Fre, 08 Dez 2000 01:36:25 +0100 (joze)" -dnl (C) 1998 - 2000 by Johannes Zellner, +dnl LAST MODIFICATION: "Mit, 10 Jan 2001 06:26:43 +0100 (joze)" +dnl (C) 1998 - 2001 by Johannes Zellner, dnl $Id$ dnl --- dnl tclreadline -- gnu readline for tcl dnl http://www.zellner.org/tclreadline/ -dnl Copyright (c) 1998 - 2000, Johannes Zellner +dnl Copyright (c) 1998 - 2001, Johannes Zellner dnl This software is copyright under the BSD license. AC_INIT(tclreadline.c) AM_CONFIG_HEADER(config.h) AC_PREREQ(2.13) @@ -15,11 +15,11 @@ AC_REVISION($Revision$) AC_CONFIG_AUX_DIR(./aux) MAJOR=2 MINOR=1 -PATCHLEVEL=0 +PATCHLEVEL=1 VERSION=$MAJOR.$MINOR PATCHLEVEL_STR=$VERSION.$PATCHLEVEL AC_SUBST(MAJOR) AC_SUBST(MINOR) @@ -154,30 +154,37 @@ AC_ARG_WITH(readline-includes, [ --with-readline-includes=DIR readline include files in DIR], rl_includes=$withval, rl_includes="") +dnl look for readline/readline.h +dnl ^^^^^^^^ AC_MSG_CHECKING([where to look for readline.h]) READLINE_INCLUDE_DIR="" -for dir in $rl_includes /usr/local/include/readline /usr/local/include /usr/include/readline /usr/include ; do - if test -r $dir/readline.h; then +for dir in $rl_includes /usr/local/include /usr/include ; do + if test -r $dir/readline/readline.h; then READLINE_INCLUDE_DIR=$dir break fi done + +dnl look directly in the include dirs for readline.h +if test -z "$READLINE_INCLUDE_DIR"; then + for dir in $rl_includes /usr/local/include /usr/include ; do + if test -r $dir/readline.h; then + READLINE_INCLUDE_DIR=$dir + AC_DEFINE_UNQUOTED(READLINE_LIBRARY, 1, [ Define if we have libreadline. ]) + break + fi + done +fi if test -z "$READLINE_INCLUDE_DIR"; then AC_MSG_ERROR([ Can't find readline.h. Use --with-readline-includes to specify the directory containing readline.h on your system.]) -else - AC_MSG_RESULT($READLINE_INCLUDE_DIR/readline.h) - base="`(basename ${READLINE_INCLUDE_DIR}) 2>/dev/null`" - if test "x${base}" != "xreadline"; then - AC_DEFINE_UNQUOTED(READLINE_LIBRARY, 1, [ Define if we have libreadline. ]) - fi fi AC_ARG_WITH(readline-library, [ --with-readline-library=DIR lib spec to readline (e.g. '-L/usr/local/lib -lreadline')], Index: pkgIndex.tcl.in ================================================================== --- pkgIndex.tcl.in +++ pkgIndex.tcl.in @@ -1,13 +1,13 @@ #!/usr/local/bin/tclsh # FILE: "/home/joze/src/tclreadline/pkgIndex.tcl.in" -# LAST MODIFICATION: "Sat, 01 Jul 2000 21:53:04 +0200 (joze)" -# (C) 1998 - 2000 by Johannes Zellner, +# LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)" +# (C) 1998 - 2001 by Johannes Zellner, # $Id$ # --- # tclreadline -- gnu readline for tcl # http://www.zellner.org/tclreadline/ -# Copyright (c) 1998 - 2000, Johannes Zellner +# Copyright (c) 1998 - 2001, Johannes Zellner # This software is copyright under the BSD license. package ifneeded tclreadline @VERSION@ \ [list source [file join $dir tclreadlineInit.tcl]] Index: tclreadline.c ================================================================== --- tclreadline.c +++ tclreadline.c @@ -1,15 +1,15 @@ /* ================================================================== FILE: "/home/joze/src/tclreadline/tclreadline.c" - LAST MODIFICATION: "Mit, 20 Sep 2000 19:27:47 +0200 (joze)" - (C) 1998 - 2000 by Johannes Zellner, + LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)" + (C) 1998 - 2001 by Johannes Zellner, $Id$ --- tclreadline -- gnu readline for tcl http://www.zellner.org/tclreadline/ - Copyright (c) 1998 - 2000, Johannes Zellner + Copyright (c) 1998 - 2001, Johannes Zellner This software is copyright under the BSD license. ================================================================== */ #ifdef HAVE_CONFIG_H # include "config.h" Index: tclreadline.h.in ================================================================== --- tclreadline.h.in +++ tclreadline.h.in @@ -1,16 +1,16 @@ /* ================================================================== FILE: "/home/joze/src/tclreadline/tclreadline.h.in" - LAST MODIFICATION: "Mit, 20 Sep 2000 17:18:12 +0200 (joze)" - (C) 1998 - 2000 by Johannes Zellner, + LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)" + (C) 1998 - 2001 by Johannes Zellner, $Id$ vim:set ft=c: --- tclreadline -- gnu readline for tcl http://www.zellner.org/tclreadline/ - Copyright (c) 1998 - 2000, Johannes Zellner + Copyright (c) 1998 - 2001, Johannes Zellner This software is copyright under the BSD license. ================================================================== */ #ifndef TCLREADLINE_H_ #define TCLREADLINE_H_ Index: tclreadline.n.in ================================================================== --- tclreadline.n.in +++ tclreadline.n.in @@ -1,15 +1,15 @@ .TH tclreadline n "@PATCHLEVEL_STR@" "Johannes Zellner" .\" FILE: "/home/joze/src/tclreadline/tclreadline.n.in" -.\" LAST MODIFICATION: "Don, 20 Jul 2000 03:29:13 +0200 (joze)" -.\" (C) 1998 - 2000 by Johannes Zellner, +.\" LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)" +.\" (C) 1998 - 2001 by Johannes Zellner, .\" $Id$ .\" --- .\" tclreadline -- gnu readline for tcl .\" http://www.zellner.org/tclreadline/ -.\" Copyright (c) 1998 - 2000, Johannes Zellner +.\" Copyright (c) 1998 - 2001, Johannes Zellner .\" This software is copyright under the BSD license. .\" # CS - begin code excerpt .de CS Index: tclreadlineCompleter.tcl ================================================================== --- tclreadlineCompleter.tcl +++ tclreadlineCompleter.tcl @@ -1,16 +1,16 @@ # -*- tclsh -*- # FILE: "/home/joze/src/tclreadline/tclreadlineCompleter.tcl" -# LAST MODIFICATION: "Sat, 01 Jul 2000 16:15:55 +0200 (joze)" -# (C) 1998 - 2000 by Johannes Zellner, +# LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)" +# (C) 1998 - 2001 by Johannes Zellner, # $Id$ # vim:set ts=4: # --- # # tclreadline -- gnu readline for tcl # http://www.zellner.org/tclreadline/ -# Copyright (c) 1998 - 2000, Johannes Zellner +# Copyright (c) 1998 - 2001, Johannes Zellner # # This software is copyright under the BSD license. # # ================================================================== Index: tclreadlineInit.tcl.in ================================================================== --- tclreadlineInit.tcl.in +++ tclreadlineInit.tcl.in @@ -1,14 +1,14 @@ #!/usr/local/bin/tclsh # FILE: "/home/joze/src/tclreadline/tclreadlineInit.tcl.in" -# LAST MODIFICATION: "Mit, 20 Sep 2000 19:29:26 +0200 (joze)" -# (C) 1998 - 2000 by Johannes Zellner, +# LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)" +# (C) 1998 - 2001 by Johannes Zellner, # $Id$ # --- # tclreadline -- gnu readline for tcl # http://www.zellner.org/tclreadline/ -# Copyright (c) 1998 - 2000, Johannes Zellner +# Copyright (c) 1998 - 2001, Johannes Zellner # This software is copyright under the BSD license. package provide tclreadline @VERSION@ namespace eval tclreadline:: { Index: tclreadlineSetup.tcl.in ================================================================== --- tclreadlineSetup.tcl.in +++ tclreadlineSetup.tcl.in @@ -1,14 +1,14 @@ #!/usr/locanl/bin/tclsh # FILE: "/home/joze/src/tclreadline/tclreadlineSetup.tcl.in" -# LAST MODIFICATION: "Sat, 01 Jul 2000 21:53:28 +0200 (joze)" -# (C) 1998 - 2000 by Johannes Zellner, +# LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:34 +0100 (joze)" +# (C) 1998 - 2001 by Johannes Zellner, # $Id$ # --- # tclreadline -- gnu readline for tcl # http://www.zellner.org/tclreadline/ -# Copyright (c) 1998 - 2000, Johannes Zellner +# Copyright (c) 1998 - 2001, Johannes Zellner # This software is copyright under the BSD license. package provide tclreadline @VERSION@ Index: tclshrl.c ================================================================== --- tclshrl.c +++ tclshrl.c @@ -1,17 +1,17 @@ /* ================================================================== FILE: "/home/joze/src/tclreadline/tclshrl.c" - LAST MODIFICATION: "Sat, 25 Mar 2000 20:51:39 +0100 (joze)" - (C) 1998 - 2000 by Johannes Zellner, + LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:34 +0100 (joze)" + (C) 1998 - 2001 by Johannes Zellner, $Id$ --- tclreadline -- gnu readline for tcl http://www.zellner.org/tclreadline/ - Copyright (c) 1998 - 2000, Johannes Zellner + Copyright (c) 1998 - 2001, Johannes Zellner This software is copyright under the BSD license. ================================================================== */ Index: wishrl.c ================================================================== --- wishrl.c +++ wishrl.c @@ -1,17 +1,17 @@ /* ================================================================== FILE: "/home/joze/src/tclreadline/wishrl.c" - LAST MODIFICATION: "Sat, 25 Mar 2000 20:52:13 +0100 (joze)" - (C) 1998 - 2000 by Johannes Zellner, + LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:34 +0100 (joze)" + (C) 1998 - 2001 by Johannes Zellner, $Id$ --- tclreadline -- gnu readline for tcl http://www.zellner.org/tclreadline/ - Copyright (c) 1998 - 2000, Johannes Zellner + Copyright (c) 1998 - 2001, Johannes Zellner This software is copyright under the BSD license. ================================================================== */