Include a dissuader for odd numbered minor releases

[pspp] / src / ui / terminal / terminal-reader.c

diff --git a/src/ui/terminal/terminal-reader.c b/src/ui/terminal/terminal-reader.c
index c80a6131dea915afc84b2fc1b2943b55cef0440b..141474a95bb9f77d18b5178403127cd8c2e5cbe9 100644 (file)
--- a/src/ui/terminal/terminal-reader.c
+++ b/src/ui/terminal/terminal-reader.c
@@ -52,7 +52,6 @@ static int rl_end;
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "data/file-name.h"
 #include "data/settings.h"
 #include "language/command.h"
 #include "language/lexer/lexer.h"
@@ -98,7 +97,7 @@ welcome (void)
         "it\nunder certain conditions; type \"show copying.\" to see the "
         "conditions.\nThere is ABSOLUTELY NO WARRANTY for PSPP; type \"show "
         "warranty.\" for details.\n", stdout);
-  puts (stat_version);
+  puts (announced_version);
   journal_init ();
 }
 
@@ -108,12 +107,15 @@ terminal_reader_cast (struct lex_reader *r)
   return UP_CAST (r, struct terminal_reader, reader);
 }
 
+
 /* Older libreadline versions do not provide rl_outstream.
    However, it is almost always going to be the same as stdout. */
 #if ! HAVE_RL_OUTSTREAM
 # define rl_outstream stdout
 #endif
 
+
+#if HAVE_READLINE
 /* Similarly, rl_echo_signal_char is fairly recent.
    We provide our own crude version if it is not present. */
 #if ! HAVE_RL_ECHO_SIGNAL_CHAR
@@ -138,6 +140,7 @@ rl_echo_signal_char (int sig)
   fflush (rl_outstream);
 }  
 #endif
+#endif
 
 
 static size_t
@@ -252,15 +255,6 @@ readline_prompt (enum prompt_style style)
 static int pfd[2];
 static bool sigint_received ;
 
-static void 
-handler (int sig)
-{
-  rl_end = 0;
-
-  write (pfd[1], "x", 1);
-  rl_echo_signal_char (sig);
-}
-
 
 /* 
    A function similar to getc from stdio.
@@ -316,6 +310,16 @@ interruptible_getc (FILE *fp)
 
 #if HAVE_READLINE
 
+static void 
+handler (int sig)
+{
+  rl_end = 0;
+
+  write (pfd[1], "x", 1);
+  rl_echo_signal_char (sig);
+}
+
+
 static void
 readline_init (void)
 {