Mercurial > hg > octave-lyh

changeset 3822:1a809dae77db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2001-04-26 16:07:17 by jwe]
author jwe
date Thu, 26 Apr 2001 16:07:18 +0000
parents b370019103de
children 1f663ddfa350
files ChangeLog Makeconf.in aclocal.m4 configure.in octMakefile.in octave-bug.in src/ChangeLog src/Makefile.in src/oct-conf.h.in src/toplev.cc
diffstat 10 files changed, 58 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-04-26  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: Don't define TERMLIBS.  Do add terminal lib(s) to LIBS.
+	* octave-bug.in: Delete references to TERMLIBS.
+	* Makeconf.in: Likewise.
+
+	* Makeconf.in (LIBREADLINE): Delete substitution.
+	(do-subst-config-vals): Likewise.
+	* octMakefile.in (SUBDIRS): Delete @READLINE_DIR@ from the list.
+	* configure.in (AC_CONFIG_SUBDIRS): Delete $READLINE_DIR from the list.
+
+	* configure.in (VOID_SIGHANDLER): Don't check or substitute here.
+
 2001-04-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* octMakefile.in (install, install-strip): Don't use mk-includedir-link
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -144,11 +144,9 @@
 
 FLIBS = @FLIBS@
 
-TERMLIBS = @TERMLIBS@
 LIBDLFCN = @LIBDLFCN@
 LIBGLOB = @LIBGLOB@
 LIBPLPLOT = @LIBPLPLOT@
-LIBREADLINE = @LIBREADLINE@
 LIBKPATHSEA = @LIBKPATHSEA@
 LIBOCTINTERP = @LIBOCTINTERP@
 LIBOCTAVE = @LIBOCTAVE@
@@ -385,7 +383,6 @@
   -e "s;%OCTAVE_CONF_LIBOCTAVE%;\"${LIBOCTAVE}\";" \
   -e "s;%OCTAVE_CONF_LIBOCTINTERP%;\"${LIBOCTINTERP}\";" \
   -e "s;%OCTAVE_CONF_LIBPLPLOT%;\"${LIBPLPLOT}\";" \
-  -e "s;%OCTAVE_CONF_LIBREADLINE%;\"${LIBREADLINE}\";" \
   -e "s;%OCTAVE_CONF_LIBS%;\"${LIBS}\";" \
   -e "s;%OCTAVE_CONF_LN_S%;\"${LN_S}\";" \
   -e "s;%OCTAVE_CONF_MKOCTFILE_INCFLAGS%;\"${MKOCTFILE_INCFLAGS}\";" \
@@ -401,7 +398,6 @@
   -e "s;%OCTAVE_CONF_SH_LDFLAGS%;\"${SH_LDFLAGS}\";" \
   -e "s;%OCTAVE_CONF_SONAME_FLAGS%;\"${SONAME_FLAGS}\";" \
   -e "s;%OCTAVE_CONF_STATIC_LIBS%;\"${STATIC_LIBS}\";" \
-  -e "s;%OCTAVE_CONF_TERMLIBS%;\"${TERMLIBS}\";" \
   -e "s;%OCTAVE_CONF_UGLY_DEFS%;\"${UGLY_DEFS}\";" \
   -e "s;%OCTAVE_CONF_VERSION%;\"${version}\";" \
   -e "s;%OCTAVE_CONF_WITH_DL%;\"${WITH_DL}\";" \
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -968,3 +968,26 @@
     AC_DEFINE(CXX_ISO_COMPLIANT_LIBRARY)
   fi
 ])
+dnl
+dnl Allow the user disable support for command line editing using GNU
+dnl readline.
+dnl
+dnl OCTAVE_ENABLE_READLINE
+AC_DEFUN(OCTAVE_ENABLE_READLINE, [
+  USE_READLINE=true
+  AC_ARG_ENABLE(readline,
+    [  --enable-readline       use readline library (default is yes)],
+    [if test "$enableval" = no; then
+       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)
+    ])
+  fi
+])
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.343 $)
+AC_REVISION($Revision: 1.344 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -131,25 +131,6 @@
 AC_SUBST(LIBPLPLOT)
 AC_SUBST(PLPLOT_DIR)
 
-### Allow the user disable support for command line editing using GNU
-### readline.
-
-READLINE_DIR=readline
-USE_READLINE=true
-LIBREADLINE='$(TOPDIR)/readline/libreadline.$(LIBEXT)'
-AC_ARG_ENABLE(readline,
-  [  --enable-readline       use readline library (default is yes)],
-  [if test "$enableval" = no; then
-     USE_READLINE=false;
-     LIBREADLINE="";
-     READLINE_DIR="";
-   fi], [])
-if $USE_READLINE; then
-  AC_DEFINE(USE_READLINE, 1)
-fi
-AC_SUBST(LIBREADLINE)
-AC_SUBST(READLINE_DIR)
-
 LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)'
 AC_SUBST(LIBKPATHSEA)
 
@@ -1156,17 +1137,15 @@
 
 OCTAVE_STRUCT_GR_PASSWD
 
-TERMLIBS=""
 for termlib in ncurses curses termcap terminfo termlib; do
   AC_CHECK_LIB(${termlib}, tputs, [TERMLIBS="${TERMLIBS} -l${termlib}"])
   case "${TERMLIBS}" in
     *-l${termlib}*)
-      AC_MSG_RESULT([defining TERMLIBS to be $TERMLIBS])
+      LIBS="$TERMLIBS $LIBS"
       break
     ;;
   esac
 done
-AC_SUBST(TERMLIBS)
 
 if test "$ac_cv_lib_termcap_tputs" = yes \
     || test "$ac_cv_lib_terminfo_tputs" = yes \
@@ -1179,6 +1158,8 @@
   AC_MSG_WARN($warn_termlibs)
 fi
 
+OCTAVE_ENABLE_READLINE
+
 AC_MSG_CHECKING([for struct exception in math.h])
 AC_TRY_LINK([#include <math.h>],
   [struct exception *x; x->type; x->name;],
@@ -1211,18 +1192,6 @@
 AC_CHECK_TYPE(nlink_t, short)
 OCTAVE_CHECK_TYPE(sigset_t, [#include <signal.h>], int)
 
-### Define VOID_SIGHANDLER for readline.
-
-case "$RETSIGTYPE" in
-  int)
-  ;;
-  *)
-    VOID_SIGHANDLER="-DVOID_SIGHANDLER=1"
-    AC_MSG_RESULT([defining VOID_SIGHANDLER to be 1])
-  ;;
-esac
-AC_SUBST(VOID_SIGHANDLER)
-
 ### A system dependent kluge or two.
 
 AC_CHECK_FUNCS(getrusage times)
@@ -1336,7 +1305,7 @@
 export CXX
 export F77
 
-AC_CONFIG_SUBDIRS($GLOB_DIR kpathsea scripts $PLPLOT_DIR $READLINE_DIR)
+AC_CONFIG_SUBDIRS($GLOB_DIR kpathsea scripts $PLPLOT_DIR)
 
 ### Do the substitutions in all the Makefiles.
 
@@ -1378,7 +1347,7 @@
   Fortran libraries:    $FLIBS
   BLAS libraries:       $BLAS_LIBS
   HDF5 libraries:       $HDF5_LIBS
-  Use GNU readline:     $USE_READLINE
+  LIBS:                 $LIBS
   Default pager:        $DEFAULT_PAGER
   gnuplot:              $GNUPLOT_BINARY
 
@@ -1428,6 +1397,11 @@
   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
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -34,7 +34,7 @@
 DISTDIRS = glob kpathsea readline # plplot
 
 # Subdirectories in which to run `make all'.
-SUBDIRS = @PLPLOT_DIR@ @READLINE_DIR@ @DLFCN_DIR@ @GLOB_DIR@ \
+SUBDIRS = @PLPLOT_DIR@ @DLFCN_DIR@ @GLOB_DIR@ \
 	kpathsea libcruft liboctave scripts doc examples
 
 ALL_SUBDIRS = $(SUBDIRS) src
--- a/octave-bug.in
+++ b/octave-bug.in
@@ -35,7 +35,6 @@
 LDFLAGS=%OCTAVE_CONF_LDFLAGS%
 LIBFLAGS=%OCTAVE_CONF_LIBFLAGS%
 RLD_FLAG=%OCTAVE_CONF_RLD_FLAG%
-TERMLIBS=%OCTAVE_CONF_TERMLIBS%
 LIBS=%OCTAVE_CONF_LIBS%
 LEXLIB=%OCTAVE_CONF_LEXLIB%
 LIBPLPLOT=%OCTAVE_CONF_LIBPLPLOT%
@@ -181,7 +180,6 @@
 LDFLAGS:          $LDFLAGS
 LIBFLAGS:         $LIBFLAGS
 RLD_FLAG:         $RLD_FLAG
-TERMLIBS:         $TERMLIBS
 LIBS:             $LIBS
 LEXLIB:           $LEXLIB
 LIBPLPLOT:        $LIBPLPLOT
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-26  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (OCTAVE_LIBS): Delete $(LIBREADLINE) from the list.
+	(octave): Delete TERMLIBS from link command.
+	* oct-conf.h.in: Delete references to LIBREADLINE, TERMLIBS.
+	* toplev.cc (octave_config_info): Delete entries for LIBREADLINE,
+	TERMLIBS.
+
 2001-04-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (install-lib): Don't use mk-libdir-link.
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -188,7 +188,7 @@
   -L$(TOPDIR)/src $(RLD_FLAG)
 
 OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \
-  $(LIBPLPLOT) $(LIBREADLINE) $(LIBKPATHSEA) $(LIBGLOB) $(LIBDLFCN)
+  $(LIBPLPLOT) $(LIBKPATHSEA) $(LIBGLOB) $(LIBDLFCN)
 
 DISTFILES = Makefile.in ChangeLog mkdefs mkops mkgendoc \
 	DOCSTRINGS mkbuiltins mk-oct-links \
@@ -259,7 +259,7 @@
 	octave.o builtins.o ops.o $(XERBLA) $(DLD_STATIC_OBJ) \
 	$(OCTAVE_LFLAGS) \
 	$(OCTAVE_LIBS) \
-	$(LEXLIB) $(TERMLIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)
+	$(LEXLIB) $(BLAS_LIBS) $(LIBS) $(FLIBS)
 
 stmp-pic: pic
 	@if [ -f stmp-pic ]; then \
--- a/src/oct-conf.h.in
+++ b/src/oct-conf.h.in
@@ -204,10 +204,6 @@
 #define OCTAVE_CONF_LIBPLPLOT %OCTAVE_CONF_LIBPLPLOT%
 #endif
 
-#ifndef OCTAVE_CONF_LIBREADLINE
-#define OCTAVE_CONF_LIBREADLINE %OCTAVE_CONF_LIBREADLINE%
-#endif
-
 #ifndef OCTAVE_CONF_LIBS
 #define OCTAVE_CONF_LIBS %OCTAVE_CONF_LIBS%
 #endif
@@ -268,10 +264,6 @@
 #define OCTAVE_CONF_STATIC_LIBS %OCTAVE_CONF_STATIC_LIBS%
 #endif
 
-#ifndef OCTAVE_CONF_TERMLIBS
-#define OCTAVE_CONF_TERMLIBS %OCTAVE_CONF_TERMLIBS%
-#endif
-
 #ifndef OCTAVE_CONF_UGLY_DEFS
 #define OCTAVE_CONF_UGLY_DEFS %OCTAVE_CONF_UGLY_DEFS%
 #endif
--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -654,7 +654,6 @@
   m ["LIBOCTAVE"] = OCTAVE_CONF_LIBOCTAVE;
   m ["LIBOCTINTERP"] = OCTAVE_CONF_LIBOCTINTERP;
   m ["LIBPLPLOT"] = OCTAVE_CONF_LIBPLPLOT;
-  m ["LIBREADLINE"] = OCTAVE_CONF_LIBREADLINE;
   m ["LIBS"] = OCTAVE_CONF_LIBS;
   m ["LN_S"] = OCTAVE_CONF_LN_S;
   m ["MKOCTFILE_INCFLAGS"] = OCTAVE_CONF_MKOCTFILE_INCFLAGS;
@@ -670,7 +669,6 @@
   m ["SH_LDFLAGS"] = OCTAVE_CONF_SH_LDFLAGS;
   m ["SONAME_FLAGS"] = OCTAVE_CONF_SONAME_FLAGS;
   m ["STATIC_LIBS"] = OCTAVE_CONF_STATIC_LIBS;
-  m ["TERMLIBS"] = OCTAVE_CONF_TERMLIBS;
   m ["UGLY_DEFS"] = OCTAVE_CONF_DEFS;
   m ["UGLY_DEFS"] = OCTAVE_CONF_UGLY_DEFS;
   m ["WITH_DL"] = OCTAVE_CONF_WITH_DL;