diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 0d96ef7a..93521f47 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-06  Marcel Telka  <marcel@telka.sk>
+
+	* configure.ac: Added test for readline library.
+	* src/Makefile.am (jtag_LDADD): Removed readline and ncurses.
+
 2003-03-06  Marcel Telka  <marcel@telka.sk>
 
 	* autogen.sh: Added test for autoreconf fail.
diff --git a/jtag/configure.ac b/jtag/configure.ac
index cb9a7c10..df090830 100644
--- a/jtag/configure.ac
+++ b/jtag/configure.ac
@@ -65,6 +65,54 @@ OPENWINCE_INC="-I$openwince_inc -I$openwince_inc/device"
 AC_SEARCH_LIBS([ioperm], [ioperm])
 AC_CHECK_FUNCS(getline getdelim)
 
+#
+# Searches for a readline compatible library.
+# http://www.gnu.org/software/ac-archive/htmldoc/vl_lib_readline.html
+#
+#AC_DEFUN([VL_LIB_READLINE], [
+  AC_CACHE_CHECK([for a readline compatible library],
+                 vl_cv_lib_readline, [
+    ORIG_LIBS="$LIBS"
+    for readline_lib in readline edit editline; do
+      for termcap_lib in "" termcap curses ncurses; do
+        if test -z "$termcap_lib"; then
+          TRY_LIB="-l$readline_lib"
+        else
+          TRY_LIB="-l$readline_lib -l$termcap_lib"
+        fi
+        LIBS="$ORIG_LIBS $TRY_LIB"
+        AC_TRY_LINK_FUNC(readline, vl_cv_lib_readline="$TRY_LIB")
+        if test -n "$vl_cv_lib_readline"; then
+          break
+        fi
+      done
+      if test -n "$vl_cv_lib_readline"; then
+        break
+      fi
+    done
+    if test -z "$vl_cv_lib_readline"; then
+      vl_cv_lib_readline="no"
+      LIBS="$ORIG_LIBS"
+    fi
+  ])
+
+  if test "$vl_cv_lib_readline" != "no"; then
+    AC_DEFINE(HAVE_LIBREADLINE, 1,
+              [Define if you have a readline compatible library])
+    AC_CHECK_HEADERS(readline.h readline/readline.h)
+    AC_CACHE_CHECK([whether readline supports history],
+                   vl_cv_lib_readline_history, [
+      vl_cv_lib_readline_history="no"
+      AC_TRY_LINK_FUNC(add_history, vl_cv_lib_readline_history="yes")
+    ])
+    if test "$vl_cv_lib_readline_history" = "yes"; then
+      AC_DEFINE(HAVE_READLINE_HISTORY, 1,
+                [Define if your readline library has \`add_history'])
+      AC_CHECK_HEADERS(history.h readline/history.h)
+    fi
+  fi
+#])dnl
+
 CFLAGS="$CFLAGS -Wall"
 
 AC_OUTPUT
diff --git a/jtag/src/Makefile.am b/jtag/src/Makefile.am
index f0291f1a..e0f7184a 100644
--- a/jtag/src/Makefile.am
+++ b/jtag/src/Makefile.am
@@ -44,7 +44,7 @@ jtag_SOURCES = \
 
 jtag_DEPENDENCIES = lib/libjtaglib.a tap/libtap.a part/libpart.a bus/libbus.a
 
-jtag_LDADD = -lreadline -lncurses -Ltap -ltap -Lpart -lpart -Llib -ljtaglib -Lbus -lbus
+jtag_LDADD = -Ltap -ltap -Lpart -lpart -Llib -ljtaglib -Lbus -lbus
 
 localedir = $(datadir)/locale
 DEFS += -DLOCALEDIR=\"$(localedir)\" -DJTAG_DATA_DIR=\"$(pkgdatadir)\"