* configure.in: Make a link for sysdep.h. Specify commontargets.

* sysdep-norm.h:  The usual alloca declarations.
* sysdep-aix.h:  What AIX 3.1 on RS/6000 needs for alloca.
* history.c, readline.c:  Use sysdep.h.

diff --git a/readline/ChangeLog b/readline/ChangeLog
index ac4b504033288838b3c250dfa0a59fe8ab391664..38d7f2efe35b7490875b689bb57534d24f6060da 100644 (file)
--- a/readline/ChangeLog
+++ b/readline/ChangeLog
@@ -1,3 +1,10 @@
+Sat Nov  9 03:19:40 1991  John Gilmore  (gnu at cygnus.com)
+
+       * configure.in:  Make a link for sysdep.h.  Specify commontargets.
+       * sysdep-norm.h:  The usual alloca declarations.
+       * sysdep-aix.h:  What AIX 3.1 on RS/6000 needs for alloca.
+       * history.c, readline.c:  Use sysdep.h.
+
 Thu Oct 24 21:58:46 1991  John Gilmore  (gnu at cygnus.com)
 
        * configure.in:  aix is a Sys V as far as we're concerned.

diff --git a/readline/configure.in b/readline/configure.in
index f7b80da238d793b9170974b1edf33bdd21eb93cd..4006e70accc0e63c7b7e449b9cee04d497731172 100644 (file)
--- a/readline/configure.in
+++ b/readline/configure.in
@@ -6,12 +6,24 @@
 configdirs=
 srctrigger=readline.c
 srcname="the readline library"
+commontargets=true
 
 # per-host:
 
+files=sysdep-norm.h
+links=sysdep.h
+
 case "${host_os}" in
-sysv* | irix* | aix*) host_makefile_frag=config/hm-sysv ;;
+m88kbcs | sysv* | irix*)
+       host_makefile_frag=config/hm-sysv
+       ;;
+
+aix*)
+       host_makefile_frag=config/hm-sysv
+       case "${host_arch}" in
+       rs6000) files=sysdep-aix.h
+       esac
+       ;;
 esac
 
 # per-target:
-

diff --git a/readline/readline.c b/readline/readline.c
index b05a7c97e5bc19677b8ec348083f934db4df465b..5238bcf6080ed33973493afe4f4cfec43011c00e 100644 (file)
--- a/readline/readline.c
+++ b/readline/readline.c
@@ -36,13 +36,7 @@ static char *xmalloc (), *xrealloc ();
 #include <sys/file.h>
 #include <signal.h>
 
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else
-#if defined (sparc) && defined (sun)
-#include <alloca.h>
-#endif
-#endif
+#include "sysdep.h"
 
 #define NEW_TTY_DRIVER
 #if defined (SYSV) || defined (hpux)  || defined (Xenix)
@@ -1503,7 +1497,7 @@ update_line (old, new, current_line)
   wsatend = 1;                 /* flag for trailing whitespace */
   ols = oe - 1;                        /* find last same */
   nls = ne - 1;
-  while ((*ols == *nls) && (ols > ofd) && (nls > nfd))
+  while ((ols > ofd) && (nls > nfd) && (*ols == *nls))
     {
       if (*ols != ' ')
        wsatend = 0;
@@ -1839,8 +1833,7 @@ init_terminal_io (terminal_name)
       return;
     }
 
-  BC = tgetstr ("pc", &buffer);
-  PC = buffer ? *buffer : 0;
+  PC = tgetstr ("pc", &buffer)? *buffer : 0;
 
   term_backspace = tgetstr ("le", &buffer);