From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 20 Jan 2014 17:59:35 +0000 (+0100)
Subject: Pass LIBREADLINE arguments to those autoconf tests which need it.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=0d2f7b51f72f3f2f830a720e0dd71096e0290c72

Pass LIBREADLINE arguments to those autoconf tests which need it.

This should hopefully resolve problems on some systems which incorrectly
detected readline library attributes.
---

diff --git a/acinclude.m4 b/acinclude.m4
index bc4d5b9d37..244a746848 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007, 2009, 2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -123,10 +123,10 @@ AC_DEFUN([PSPP_READLINE],
     AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.])
     AC_MSG_CHECKING([how to link with libreadline])
     AC_MSG_RESULT([$LIBREADLINE])
-    AC_SEARCH_LIBS([rl_outstream], [readline],
-        AC_DEFINE(HAVE_RL_OUTSTREAM, 1, [Define if the readline library provides rl_outstream.]))
     AC_SEARCH_LIBS([rl_echo_signal_char], [readline],
-        AC_DEFINE(HAVE_RL_ECHO_SIGNAL_CHAR, 1, [Define if the readline library provides rl_echo_signal_char.]))
+        AC_DEFINE(HAVE_RL_ECHO_SIGNAL_CHAR, 1, [Define if the readline library provides rl_echo_signal_char.]),[],[$LIBREADLINE])
+    AC_SEARCH_LIBS([rl_outstream], [readline],
+        AC_DEFINE(HAVE_RL_OUTSTREAM, 1, [Define if the readline library provides rl_outstream.]),[],[$LIBREADLINE])
   else
     dnl If $LIBREADLINE didn't lead to a usable library, we don't
     dnl need $INCREADLINE either.