+2006-10-31 Borut Razem <borut.razem AT siol.net>
+
+ * debugger/mcs51/acinclude.m4, debugger/mcs51/aclocal.m4,
+ debugger/mcs51/configure: get readline version
+
2006-10-30 Borut Razem <borut.razem AT siol.net>
* debugger/mcs51/sdcdb.c: replaced hardcoded "/" with DIR_SEPARATOR_STRING
AC_DEFUN([wi_LIB_READLINE], [
dnl check for the readline.h header file
+
AC_CHECK_HEADER(readline/readline.h)
if test "$ac_cv_header_readline_readline_h" = yes; then
+ dnl check the readline version
+
+ cat > conftest.$ac_ext <<EOF
+#include <stdio.h>
+#include <readline/readline.h>
+wi_LIB_READLINE_VERSION RL_VERSION_MAJOR RL_VERSION_MINOR
+EOF
+
+ wi_READLINE_VERSION=$($CPP $CPPFLAGS conftest.$ac_ext | sed -n -e "s/^wi_LIB_READLINE_VERSION *\([[0-9\]][[0-9\]]*\) *\([[0-9\]][[0-9\]]*\)$/\1.\2/p")
+ rm -rf conftest*
+
+ if test -n "$wi_READLINE_VERSION"; then
+ wi_MAJOR=$(expr $wi_READLINE_VERSION : '\([[0-9]][[0-9]]*\)\.')
+ wi_MINOR=$(expr $wi_READLINE_VERSION : '[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*$\)')
+ if test $wi_MINOR -lt 10; then
+ wi_MINOR=$(expr $wi_MINOR \* 10)
+ fi
+ wi_READLINE_VERSION=$(expr $wi_MAJOR \* 100 + $wi_MINOR)
+ else
+ wi_READLINE_VERSION=-1
+ fi
+
dnl check for the readline library
ac_save_LIBS="$LIBS"
for LIBREADLINE in "-lreadline.dll" "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
do
- AC_MSG_CHECKING([for GNU Readline library])
+ AC_MSG_CHECKING([for GNU Readline library $LIBREADLINE])
LIBS="$ac_save_LIBS $LIBREADLINE"
rl_function_of_keyseq(NULL, NULL, NULL);
],[
wi_cv_lib_readline=yes
- wi_cv_lib_readline_result="$LIBREADLINE"
+ wi_cv_lib_readline_result=yes
],[
wi_cv_lib_readline=no
wi_cv_lib_readline_result=no
if test "$wi_cv_lib_readline" = yes; then
AC_MSG_RESULT($wi_cv_lib_readline_result)
AC_SUBST(LIBREADLINE)
- AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE, 1, [Readline])
+ AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE, $wi_READLINE_VERSION, [Readline])
break
fi
done
AC_DEFUN([wi_LIB_READLINE], [
dnl check for the readline.h header file
+
AC_CHECK_HEADER(readline/readline.h)
if test "$ac_cv_header_readline_readline_h" = yes; then
+ dnl check the readline version
+
+ cat > conftest.$ac_ext <<EOF
+#include <stdio.h>
+#include <readline/readline.h>
+wi_LIB_READLINE_VERSION RL_VERSION_MAJOR RL_VERSION_MINOR
+EOF
+
+ wi_READLINE_VERSION=$($CPP $CPPFLAGS conftest.$ac_ext | sed -n -e "s/^wi_LIB_READLINE_VERSION *\([[0-9\]][[0-9\]]*\) *\([[0-9\]][[0-9\]]*\)$/\1.\2/p")
+ rm -rf conftest*
+
+ if test -n "$wi_READLINE_VERSION"; then
+ wi_MAJOR=$(expr $wi_READLINE_VERSION : '\([[0-9]][[0-9]]*\)\.')
+ wi_MINOR=$(expr $wi_READLINE_VERSION : '[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*$\)')
+ if test $wi_MINOR -lt 10; then
+ wi_MINOR=$(expr $wi_MINOR \* 10)
+ fi
+ wi_READLINE_VERSION=$(expr $wi_MAJOR \* 100 + $wi_MINOR)
+ else
+ wi_READLINE_VERSION=-1
+ fi
+
dnl check for the readline library
ac_save_LIBS="$LIBS"
for LIBREADLINE in "-lreadline.dll" "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
do
- AC_MSG_CHECKING([for GNU Readline library])
+ AC_MSG_CHECKING([for GNU Readline library $LIBREADLINE])
LIBS="$ac_save_LIBS $LIBREADLINE"
rl_function_of_keyseq(NULL, NULL, NULL);
],[
wi_cv_lib_readline=yes
- wi_cv_lib_readline_result="$LIBREADLINE"
+ wi_cv_lib_readline_result=yes
],[
wi_cv_lib_readline=no
wi_cv_lib_readline_result=no
if test "$wi_cv_lib_readline" = yes; then
AC_MSG_RESULT($wi_cv_lib_readline_result)
AC_SUBST(LIBREADLINE)
- AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE, 1, [Readline])
+ AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE, $wi_READLINE_VERSION, [Readline])
break
fi
done
- if test "${ac_cv_header_readline_readline_h+set}" = set; then
+
+ if test "${ac_cv_header_readline_readline_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for readline/readline.h" >&5
echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; }
if test "${ac_cv_header_readline_readline_h+set}" = set; then
if test "$ac_cv_header_readline_readline_h" = yes; then
+ cat > conftest.$ac_ext <<EOF
+#include <stdio.h>
+#include <readline/readline.h>
+wi_LIB_READLINE_VERSION RL_VERSION_MAJOR RL_VERSION_MINOR
+EOF
+
+ wi_READLINE_VERSION=$($CPP $CPPFLAGS conftest.$ac_ext | sed -n -e "s/^wi_LIB_READLINE_VERSION *\([0-9\][0-9\]*\) *\([0-9\][0-9\]*\)$/\1.\2/p")
+ rm -rf conftest*
+
+ if test -n "$wi_READLINE_VERSION"; then
+ wi_MAJOR=$(expr $wi_READLINE_VERSION : '\([0-9][0-9]*\)\.')
+ wi_MINOR=$(expr $wi_READLINE_VERSION : '[0-9][0-9]*\.\([0-9][0-9]*$\)')
+ if test $wi_MINOR -lt 10; then
+ wi_MINOR=$(expr $wi_MINOR \* 10)
+ fi
+ wi_READLINE_VERSION=$(expr $wi_MAJOR \* 100 + $wi_MINOR)
+ else
+ wi_READLINE_VERSION=-1
+ fi
+
+
ac_save_LIBS="$LIBS"
# Note: $LIBCURSES is permitted to be empty.
for LIBREADLINE in "-lreadline.dll" "-lreadline" "-lreadline $LIBCURSES" "-lreadline -ltermcap" "-lreadline -lncurses" "-lreadline -lcurses"
do
- { echo "$as_me:$LINENO: checking for GNU Readline library" >&5
-echo $ECHO_N "checking for GNU Readline library... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for GNU Readline library $LIBREADLINE" >&5
+echo $ECHO_N "checking for GNU Readline library $LIBREADLINE... $ECHO_C" >&6; }
LIBS="$ac_save_LIBS $LIBREADLINE"
(exit $ac_status); }; }; then
wi_cv_lib_readline=yes
- wi_cv_lib_readline_result="$LIBREADLINE"
+ wi_cv_lib_readline_result=yes
else
echo "$as_me: failed program was:" >&5
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBREADLINE 1
+#define HAVE_LIBREADLINE $wi_READLINE_VERSION
_ACEOF
break