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

  debugger/mcs51/configure: fixed failed check because the function
  rl_function_of_keyseq isn't in Readline 5.2. Thanks to Ilya Goldberg
  who submitted the patch for gpsim.
* debugger/mcs51/configure.in: removed the result message
* debugger/mcs51/Makefile.in: fixed the config.status warning
  "... seems to ignore the --datarootdir setting"

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4467 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index f5d7807bedc2d376b90c658c11b133a2df1af549..da090bb03edc3864cb7639e80e4901148830bacd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-06 Borut Razem <borut.razem AT siol.net>
+
+       * debugger/mcs51/acinclude.m4, debugger/mcs51/aclocal.m4,
+         debugger/mcs51/configure: fixed failed check because the function
+         rl_function_of_keyseq isn't in Readline 5.2. Thanks to Ilya Goldberg
+         who submitted the patch for gpsim.
+       * debugger/mcs51/configure.in: removed the result message
+       * debugger/mcs51/Makefile.in: fixed the config.status warning
+         "... seems to ignore the --datarootdir setting"
+
 2006-11-03 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * device/include/mcs51/c8051f020.h,

diff --git a/debugger/mcs51/Makefile.in b/debugger/mcs51/Makefile.in
index 740cf9204905fe03603bbbd9f443b8e9719ea969..185422a165e0882cf0871336e072b85e1e31cfe0 100644 (file)
--- a/debugger/mcs51/Makefile.in
+++ b/debugger/mcs51/Makefile.in
@@ -17,16 +17,7 @@ SDCCLIB              = $(top_builddir)src
 VPATH           = @srcdir@
 srcdir         = @srcdir@
 
-prefix         = @prefix@
-exec_prefix     = @exec_prefix@
 bindir          = @bindir@
-libdir          = @libdir@
-datadir         = @datadir@
-includedir      = @includedir@
-mandir          = @mandir@
-man1dir         = $(mandir)/man1
-man2dir         = $(mandir)/man2
-infodir         = @infodir@
 
 STD_INC                = @sdcc_include_dir@
 CPPFLAGS       = @CPPFLAGS@ -I. -I$(top_builddir) -I$(top_srcdir) -I$(srcdir)/$(SLIB) -DHAVE_CONFIG_H

diff --git a/debugger/mcs51/acinclude.m4 b/debugger/mcs51/acinclude.m4
index 7c436e51e118dc595b4ee250a4c1080d5cbce442..f4cbe90a9551840a648e3fc668a8f924dba47cb6 100644 (file)
--- a/debugger/mcs51/acinclude.m4
+++ b/debugger/mcs51/acinclude.m4
@@ -50,8 +50,8 @@ EOF
         #include <readline/readline.h>
       ],[
         /* function-body */
+        int dummy = rl_completion_append_character; /* rl_completion_append_character appeared in version 2.1 */
         readline(NULL);
-        rl_function_of_keyseq(NULL, NULL, NULL);
       ],[
         wi_cv_lib_readline=yes
         AC_MSG_RESULT(yes)

diff --git a/debugger/mcs51/aclocal.m4 b/debugger/mcs51/aclocal.m4
index 678856ba896dd415ba84f6ac1bd48e2d96fc6a43..b76b053406326a756a3b33ff1862fce5ca417261 100644 (file)
--- a/debugger/mcs51/aclocal.m4
+++ b/debugger/mcs51/aclocal.m4
@@ -62,8 +62,8 @@ EOF
         #include <readline/readline.h>
       ],[
         /* function-body */
+        int dummy = rl_completion_append_character; /* rl_completion_append_character appeared in version 2.1 */
         readline(NULL);
-        rl_function_of_keyseq(NULL, NULL, NULL);
       ],[
         wi_cv_lib_readline=yes
         AC_MSG_RESULT(yes)

diff --git a/debugger/mcs51/configure b/debugger/mcs51/configure
index 66d1a74d12df652aead120f57b26bf01b2d7fbc5..e1e24184c2134c64cf9c3d76dd5e78a21ea28258 100644 (file)
--- a/debugger/mcs51/configure
+++ b/debugger/mcs51/configure
@@ -3577,8 +3577,8 @@ main ()
 {
 
         /* function-body */
+        int dummy = rl_completion_append_character; /* rl_completion_append_character appeared in version 2.1 */
         readline(NULL);
-        rl_function_of_keyseq(NULL, NULL, NULL);
 
   ;
   return 0;
@@ -6863,65 +6863,4 @@ if test "$no_create" != yes; then
 fi
 
 
-# Prepare result message
-# ======================
-
-# In the C-header we need \\ as dir-separator, but in the message only \
-dirch=${sdccconf_h_dir_separator}
-test ${dirch} = '\\' && dirch='\'
-
-{ echo "$as_me:$LINENO: result:
-sdcdb is now configured for
-
-  Build:                ${build_alias}
-  Host:                 ${host_alias}
-  Source directory:     ${srcdir}
-  C compiler:           ${CC}
-  CFLAGS:               ${CFLAGS}
-
-  Install paths:
-    binary files:       ${exec_prefix}
-    include files:      ${datadir}/${include_dir_suffix}
-    library files:      ${datadir}/${lib_dir_suffix}
-    documentation:      ${docdir}
-
-    prefix:             ${prefix}
-    datadir:            ${datadir}
-
-  Search paths (incomplete, see manual for all search paths):
-    binary files:       \$SDCC_HOME${binPath}
-    include files:      ${incPath1}
-                        path(argv[0])${incPath2}
-                        ${incPath3}
-    library files:      \$SDCC_HOME${libPath1}${dirch}<model>
-                        path(argv[0])${libPath2}${dirch}<model>
-                        ${libPath3}${dirch}<model>
-" >&5
-echo "${ECHO_T}
-sdcdb is now configured for
-
-  Build:                ${build_alias}
-  Host:                 ${host_alias}
-  Source directory:     ${srcdir}
-  C compiler:           ${CC}
-  CFLAGS:               ${CFLAGS}
-
-  Install paths:
-    binary files:       ${exec_prefix}
-    include files:      ${datadir}/${include_dir_suffix}
-    library files:      ${datadir}/${lib_dir_suffix}
-    documentation:      ${docdir}
-
-    prefix:             ${prefix}
-    datadir:            ${datadir}
-
-  Search paths (incomplete, see manual for all search paths):
-    binary files:       \$SDCC_HOME${binPath}
-    include files:      ${incPath1}
-                        path(argv[0])${incPath2}
-                        ${incPath3}
-    library files:      \$SDCC_HOME${libPath1}${dirch}<model>
-                        path(argv[0])${libPath2}${dirch}<model>
-                        ${libPath3}${dirch}<model>
-" >&6; }
 # End of configure/configure.in

diff --git a/debugger/mcs51/configure.in b/debugger/mcs51/configure.in
index 72ffac80a6c485878e5b922e75fd0c21233baa9d..c3676b55d93b72e21d9da4d7dfdeb28f6cc7d29d 100644 (file)
--- a/debugger/mcs51/configure.in
+++ b/debugger/mcs51/configure.in
@@ -213,38 +213,4 @@ AC_DEFINE_UNQUOTED(LIB_DIR_SUFFIX,
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
-# Prepare result message
-# ======================
-
-# In the C-header we need \\ as dir-separator, but in the message only \
-dirch=${sdccconf_h_dir_separator}
-test ${dirch} = '\\' && dirch='\'
-
-AC_MSG_RESULT([
-sdcdb is now configured for
-
-  Build:                ${build_alias}
-  Host:                 ${host_alias}
-  Source directory:     ${srcdir}
-  C compiler:           ${CC}
-  CFLAGS:               ${CFLAGS}
-
-  Install paths:
-    binary files:       ${exec_prefix}
-    include files:      ${datadir}/${include_dir_suffix}
-    library files:      ${datadir}/${lib_dir_suffix}
-    documentation:      ${docdir}
-
-    prefix:             ${prefix}
-    datadir:            ${datadir}
-
-  Search paths (incomplete, see manual for all search paths):
-    binary files:       \$SDCC_HOME${binPath}
-    include files:      ${incPath1}
-                        path(argv[[0]])${incPath2}
-                        ${incPath3}
-    library files:      \$SDCC_HOME${libPath1}${dirch}<model>
-                        path(argv[[0]])${libPath2}${dirch}<model>
-                        ${libPath3}${dirch}<model>
-])
 # End of configure/configure.in