Mercurial > octave-nkf
changeset 3824:0ee55719541a
[project @ 2001-04-26 17:07:21 by jwe]
| author | jwe |
|---|---|
| date | Thu, 26 Apr 2001 17:07:22 +0000 |
| parents | 1f663ddfa350 |
| children | 74255bd05bdd |
| files | ChangeLog aclocal.m4 configure.in |
| diffstat | 3 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 26 16:15:51 2001 +0000 +++ b/ChangeLog Thu Apr 26 17:07:22 2001 +0000 @@ -1,5 +1,8 @@ 2001-04-26 John W. Eaton <jwe@bevo.che.wisc.edu> + * aclocal.m4 (OCTAVE_ENABLE_READLINE): Require readline unless + --disable-readline is specified. + * configure.in: Don't define TERMLIBS. Do add terminal lib(s) to LIBS. * octave-bug.in: Delete references to TERMLIBS. * Makeconf.in: Likewise.
--- a/aclocal.m4 Thu Apr 26 16:15:51 2001 +0000 +++ b/aclocal.m4 Thu Apr 26 17:07:22 2001 +0000 @@ -978,16 +978,15 @@ AC_ARG_ENABLE(readline, [ --enable-readline use readline library (default is yes)], [if test "$enableval" = no; then - USE_READLINE=false; - fi], []) + USE_READLINE=false + fi]) if $USE_READLINE; then AC_CHECK_LIB(readline, rl_set_keyboard_input_timeout, [ LIBS="-lreadline $LIBS" AC_DEFINE(USE_READLINE, 1) ], [ - USE_READLINE=false - warn_readline="To use GNU Readline, I need version 4.2 or later" - AC_MSG_WARN($warn_readline) + AC_MSG_WARN([I need GNU Readline 4.2 or later]) + AC_MSG_ERROR([this is fatal unless you specify --disable-readline]) ]) fi ])
--- a/configure.in Thu Apr 26 16:15:51 2001 +0000 +++ b/configure.in Thu Apr 26 17:07:22 2001 +0000 @@ -21,7 +21,7 @@ ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA ### 02111-1307, USA. -AC_REVISION($Revision: 1.344 $) +AC_REVISION($Revision: 1.345 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -1397,11 +1397,6 @@ warn_msg_printed=true fi -if test -n "$warn_readline"; then - AC_MSG_WARN($warn_readline) - warn_msg_printed=true -fi - if test -n "$warn_termlibs"; then AC_MSG_WARN($warn_termlibs) warn_msg_printed=true