From 0f42de4e72bd19def7eb9e80b2edde259e53b344 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Thu, 24 Jul 2003 13:43:52 +0000 Subject: [PATCH] 2003-07-24 Marcel Telka * po/POTFILES.in: Removed missing files. * configure.ac: Removed VL_LIB_READLINE macro and moved it to ... * acinclude.m4: ... this new file. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@492 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 6 +++ jtag/acinclude.m4 | 91 +++++++++++++++++++++++++++++++++++++++++++++ jtag/configure.ac | 48 +----------------------- jtag/po/POTFILES.in | 3 -- 4 files changed, 98 insertions(+), 50 deletions(-) create mode 100644 jtag/acinclude.m4 diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 1970d51d..812b2a4e 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,9 @@ +2003-07-24 Marcel Telka + + * po/POTFILES.in: Removed missing files. + * configure.ac: Removed VL_LIB_READLINE macro and moved it to ... + * acinclude.m4: ... this new file. + 2003-07-16 Marcel Telka * src/jtag.c (jtag_parse_line): Fixed invalid memory allocation size (core dump). diff --git a/jtag/acinclude.m4 b/jtag/acinclude.m4 new file mode 100644 index 00000000..51479d9f --- /dev/null +++ b/jtag/acinclude.m4 @@ -0,0 +1,91 @@ +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 +dnl # elif defined(HAVE_READLINE_H) +dnl # include +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 +dnl # elif defined(HAVE_HISTORY_H) +dnl # include +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 +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/configure.ac b/jtag/configure.ac index f794f2ce..211af10f 100644 --- a/jtag/configure.ac +++ b/jtag/configure.ac @@ -92,53 +92,7 @@ AC_CHECK_FUNCS(getline getdelim) AC_CHECK_HEADERS(linux/ppdev.h) -# -# 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 +VL_LIB_READLINE CFLAGS="$CFLAGS -Wall" CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/include" diff --git a/jtag/po/POTFILES.in b/jtag/po/POTFILES.in index c6acd13e..e326b844 100644 --- a/jtag/po/POTFILES.in +++ b/jtag/po/POTFILES.in @@ -7,18 +7,15 @@ src/bus/sh7727.c src/cmd/cable.c src/cmd/cmd.c src/cmd/detect.c -src/cmd/detectflash.c src/cmd/discovery.c src/cmd/dr.c src/cmd/endian.c src/cmd/flashmem.c src/cmd/frequency.c src/cmd/get.c -src/cmd/help.c src/cmd/instruction.c src/cmd/peekpoke.c src/cmd/print.c -src/cmd/quit.c src/cmd/readmem.c src/cmd/script.c src/cmd/set.c