diff --git a/jtag/.cvsignore b/jtag/.cvsignore
index b70b519b..a2921658 100644
--- a/jtag/.cvsignore
+++ b/jtag/.cvsignore
@@ -13,3 +13,4 @@ m4
 config.h
 config.h.in
 stamp-h1
+acinclude.m4
diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index ad79e816..031ff83a 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-20  Marcel Telka  <marcel@telka.sk>
+
+	* acinclude.m4: File removed.
+	* autogen.sh: Added acinclude call.
+
 2003-12-20  Marcel Telka  <marcel@telka.sk>
 
 	* src/bus/Makefile.am (libbus_a_SOURCES): Added au1500.c.
diff --git a/jtag/acinclude.m4 b/jtag/acinclude.m4
deleted file mode 100644
index 51479d9f..00000000
--- a/jtag/acinclude.m4
+++ /dev/null
@@ -1,91 +0,0 @@
-dnl @synopsis VL_LIB_READLINE
-dnl
-dnl Searches for a readline compatible library.  If found, defines
-dnl `HAVE_LIBREADLINE'.  If the found library has the `add_history'
-dnl function, sets also `HAVE_READLINE_HISTORY'.  Also checks for the
-dnl locations of the necessary include files and sets `HAVE_READLINE_H'
-dnl or `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
-dnl 'HAVE_HISTORY_H' if the corresponding include files exists.
-dnl
-dnl The libraries that may be readline compatible are `libedit',
-dnl `libeditline' and `libreadline'.  Sometimes we need to link a termcap
-dnl library for readline to work, this macro tests these cases too by
-dnl trying to link with `libtermcap', `libcurses' or `libncurses' before
-dnl giving up.
-dnl
-dnl Here is an example of how to use the information provided by this
-dnl macro to perform the necessary includes or declarations in a C file:
-dnl
-dnl   #ifdef HAVE_LIBREADLINE
-dnl   #  if defined(HAVE_READLINE_READLINE_H)
-dnl   #    include <readline/readline.h>
-dnl   #  elif defined(HAVE_READLINE_H)
-dnl   #    include <readline.h>
-dnl   #  else /* !defined(HAVE_READLINE_H) */
-dnl   extern char *readline ();
-dnl   #  endif /* !defined(HAVE_READLINE_H) */
-dnl   char *cmdline = NULL;
-dnl   #else /* !defined(HAVE_READLINE_READLINE_H) */
-dnl     /* no readline */
-dnl   #endif /* HAVE_LIBREADLINE */
-dnl
-dnl   #ifdef HAVE_READLINE_HISTORY
-dnl   #  if defined(HAVE_READLINE_HISTORY_H)
-dnl   #    include <readline/history.h>
-dnl   #  elif defined(HAVE_HISTORY_H)
-dnl   #    include <history.h>
-dnl   #  else /* !defined(HAVE_HISTORY_H) */
-dnl   extern void add_history ();
-dnl   extern int write_history ();
-dnl   extern int read_history ();
-dnl   #  endif /* defined(HAVE_READLINE_HISTORY_H) */
-dnl     /* no history */
-dnl   #endif /* HAVE_READLINE_HISTORY */
-dnl
-dnl
-dnl @version 1.1
-dnl @author Ville Laurikari <vl@iki.fi>
-dnl
-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
diff --git a/jtag/autogen.sh b/jtag/autogen.sh
index dc57579d..8dff67d6 100755
--- a/jtag/autogen.sh
+++ b/jtag/autogen.sh
@@ -22,6 +22,8 @@
 # Written by Marcel Telka <marcel@telka.sk>, 2002, 2003.
 #
 
+acinclude
+
 if autoreconf -i -s -v -f ; then
 	echo
 	echo "autoreconf done."