Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -1,8 +1,8 @@
 # -*- make -*-
-# FILE: "/home/joze/src/tclreadline/Makefile.in"
-# LAST MODIFICATION: "Mon Sep 20 00:50:49 1999 (joze)"
+# FILE: "/disk01/home/joze/src/tclreadline/Makefile.in"
+# LAST MODIFICATION: "Mon Sep 20 02:18:01 1999 (joze)"
 # (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
 # $Id$
 # ---
 #
 # tclreadline -- gnu readline for tcl
@@ -190,16 +190,17 @@
 
 MAN = tclreadline.n
 HTML = tclreadline.n.html
 
 CIFLAGS = -f -t-"gnu readline for tcl" -m"before initial relase"
+
+all: $(TCLREADLINE_LIB_FILE)
 
 .PHONY: clean distclean ctags tcltags vimtags tags ci co
 
 .SUFFIXES: .c .o .so .sl .tcl
 
-all: $(TCLREADLINE_LIB_FILE)
 
 
 @TCLREADLINE_LIB_FILE@: ${OBJS}
 	rm -f $(TCLREADLINE_LIB_FILE)
 	@MAKE_LIB@ $(TERMLIB_DIR) $(READLINE_LIB) $(TERMLIB)

Index: config.h.in
==================================================================
--- config.h.in
+++ config.h.in
@@ -1,10 +1,10 @@
 
  /* ==================================================================
    
-    FILE: "/home/joze/src/tclreadline/config.h.in"
-    LAST MODIFICATION: "Mon Sep 20 01:31:18 1999 (joze)"
+    FILE: "/disk01/home/joze/src/tclreadline/config.h.in"
+    LAST MODIFICATION: "Mon Sep 20 02:20:49 1999 (joze)"
     (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
     $Id$
     vim:set ft=c:
     ---
 
@@ -32,5 +32,7 @@
 
 
 #undef EXECUTING_MACRO_HACK
 
 #undef CLEANUP_AFER_SIGNAL
+
+#undef READLINE_LIBRARY

Index: configure.in
==================================================================
--- configure.in
+++ configure.in
@@ -1,8 +1,8 @@
 # -*- autoconf -*-
 # FILE: "/disk01/home/joze/src/tclreadline/configure.in"
-# LAST MODIFICATION: "Mon Sep 20 01:54:59 1999 (joze)"
+# LAST MODIFICATION: "Mon Sep 20 02:37:03 1999 (joze)"
 # (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
 # $Id$
 # ---
 #
 # tclreadline -- gnu readline for tcl
@@ -48,11 +48,11 @@
 AC_CONFIG_AUX_DIR(./aux)
 AC_CANONICAL_HOST
 
 
 TCLREADLINE_LPATH=`echo $LD_LIBRARY_PATH $LD_RUN_PATH $LPATH | sed 's/:/ /g'`
-TCLREADLINE_LPATH="$TCLREADLINE_LPATH /usr/local/lib /lib /usr/lib"
+TCLREADLINE_LPATH="$TCLREADLINE_LPATH /usr/local/lib /lib /usr/lib /usr/shlib"
 
 
 #--------------------------------------------------------------------
 #   See if there was a command-line option for where Tcl is;  if
 #   not, search for Tcl.
@@ -298,10 +298,14 @@
   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)
+	fi
 fi
 
 
 
 #--------------------------------------------------------------------
@@ -423,27 +427,23 @@
 # check for readline's (macro.c) private variable
 # _rl_executing_macro.
 
 AC_MSG_CHECKING([for _rl_executing_macro in -lreadline])
 AC_TRY_LINK(,[
-extern char* _rl_executing_macro;
-int main () {
-    _rl_executing_macro = (char*) 0;
-    return 0;
-}],
+	extern char* _rl_executing_macro;
+	_rl_executing_macro = (char*) 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;
-}],
+    extern void rl_cleanup_after_signal();
+	rl_cleanup_after_signal();
+],
     AC_MSG_RESULT(yes); AC_DEFINE_UNQUOTED(CLEANUP_AFER_SIGNAL, 1),
     AC_MSG_RESULT(no))
 
 
 AC_MSG_CHECKING([for the readline version number])

Index: tclreadline.c
==================================================================
--- tclreadline.c
+++ tclreadline.c
@@ -1,10 +1,10 @@
 
  /* ==================================================================
 
-    FILE: "/home/joze/src/tclreadline/tclreadline.c"
-    LAST MODIFICATION: "Mon Sep 20 01:35:18 1999 (joze)"
+    FILE: "/disk01/home/joze/src/tclreadline/tclreadline.c"
+    LAST MODIFICATION: "Mon Sep 20 02:20:33 1999 (joze)"
     (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
     $Id$
     ---
 
     tclreadline -- gnu readline for tcl
@@ -34,12 +34,18 @@
 
 #include <tcl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <readline/readline.h>
-#include <readline/history.h>
+
+#if defined (READLINE_LIBRARY)
+#   include <readline.h>
+#   include <history.h>
+#else
+#   include <readline/readline.h>
+#   include <readline/history.h>
+#endif
 
 /**
  * this prototype is missing
  * in readline.h
  */