From: borutr Date: Tue, 31 Oct 2006 19:19:25 +0000 (+0000) Subject: * debugger/mcs51/acinclude.m4, debugger/mcs51/aclocal.m4, X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b84b4ae4f9cb5cafbd915728c528c31bb42d4077;p=fw%2Fsdcc * debugger/mcs51/acinclude.m4, debugger/mcs51/aclocal.m4, debugger/mcs51/configure: get readline version git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4452 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/ChangeLog b/ChangeLog index 684763c4..05a9532e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-31 Borut Razem + + * debugger/mcs51/acinclude.m4, debugger/mcs51/aclocal.m4, + debugger/mcs51/configure: get readline version + 2006-10-30 Borut Razem * debugger/mcs51/sdcdb.c: replaced hardcoded "/" with DIR_SEPARATOR_STRING diff --git a/debugger/mcs51/acinclude.m4 b/debugger/mcs51/acinclude.m4 index 64ea826c..cad710b9 100644 --- a/debugger/mcs51/acinclude.m4 +++ b/debugger/mcs51/acinclude.m4 @@ -7,9 +7,32 @@ dnl for .m4 macros. 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 < +#include +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" @@ -17,7 +40,7 @@ AC_DEFUN([wi_LIB_READLINE], [ 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" @@ -31,7 +54,7 @@ AC_DEFUN([wi_LIB_READLINE], [ 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 @@ -40,7 +63,7 @@ AC_DEFUN([wi_LIB_READLINE], [ 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 diff --git a/debugger/mcs51/aclocal.m4 b/debugger/mcs51/aclocal.m4 index 65d5bade..e3915509 100644 --- a/debugger/mcs51/aclocal.m4 +++ b/debugger/mcs51/aclocal.m4 @@ -19,9 +19,32 @@ dnl for .m4 macros. 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 < +#include +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" @@ -29,7 +52,7 @@ AC_DEFUN([wi_LIB_READLINE], [ 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" @@ -43,7 +66,7 @@ AC_DEFUN([wi_LIB_READLINE], [ 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 @@ -52,7 +75,7 @@ AC_DEFUN([wi_LIB_READLINE], [ 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 diff --git a/debugger/mcs51/configure b/debugger/mcs51/configure index 2e7b6a3b..c1f88b7a 100644 --- a/debugger/mcs51/configure +++ b/debugger/mcs51/configure @@ -3375,7 +3375,8 @@ 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 @@ -3529,13 +3530,34 @@ fi if test "$ac_cv_header_readline_readline_h" = yes; then + cat > conftest.$ac_ext < +#include +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" @@ -3598,7 +3620,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (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 @@ -3619,7 +3641,7 @@ echo "${ECHO_T}$wi_cv_lib_readline_result" >&6; } cat >>confdefs.h <<_ACEOF -#define HAVE_LIBREADLINE 1 +#define HAVE_LIBREADLINE $wi_READLINE_VERSION _ACEOF break