* debugger/mcs51/acinclude.m4, debugger/mcs51/aclocal.m4,

[fw/sdcc] / debugger / mcs51 / configure

diff --git a/debugger/mcs51/configure b/debugger/mcs51/configure
index 2e7b6a3b6ad994172efe8e63fc0ff86dc9352ef8..c1f88b7a26dae88fe5964d21f60174727a1fc3be 100644 (file)
--- 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 <<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"
 
@@ -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