Mercurial > octave

changeset 25315:bb43ec3a304e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Thu, 26 Apr 2018 06:49:06 -0400
parents 74fbe0d91994 (current diff) 159b359ccc13 (diff)
children 2ad00275b79b
files configure.ac doc/interpreter/octave.texi
diffstat 8 files changed, 115 insertions(+), 74 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh	Tue Apr 24 18:32:22 2018 -0700
+++ b/build-aux/subst-config-vals.in.sh	Thu Apr 26 06:49:06 2018 -0400
@@ -20,6 +20,21 @@
 
 : ${SED=@SED@}
 
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+
+bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"`
+libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"`
+octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"`
+
+includedir=`echo "@includedir@" | sed "s|^${prefix}/||"`
+octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"`
+
+srcdir="@srcdir@"
+top_srcdir="@top_srcdir@"
+abs_srcdir="@abs_srcdir@"
+abs_top_srcdir="@abs_top_srcdir@"
+
 NO_OCT_FILE_STRIP="@NO_OCT_FILE_STRIP@"
 AMD_CPPFLAGS="@AMD_CPPFLAGS@"
 AMD_LDFLAGS="@AMD_LDFLAGS@"
@@ -178,16 +193,6 @@
 Z_LIBS="@Z_LIBS@"
 config_opts="@config_opts@"
 
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-
-bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"`
-libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"`
-octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"`
-
-includedir=`echo "@includedir@" | sed "s|^${prefix}/||"`
-octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"`
-
 $SED \
   -e "s|%NO_EDIT_WARNING%|DO NOT EDIT!  Generated automatically by subst-config-vals.|" \
   -e "s|%NO_OCT_FILE_STRIP%|${NO_OCT_FILE_STRIP}|" \
--- a/build-aux/subst-cross-config-vals.in.sh	Tue Apr 24 18:32:22 2018 -0700
+++ b/build-aux/subst-cross-config-vals.in.sh	Thu Apr 26 06:49:06 2018 -0400
@@ -32,6 +32,21 @@
 ##   OCTAVE_CONF_MKOCTFILE_LD_CXX
 ##   OCTAVE_CONF_MKOCTFILE_RANLIB
 
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+
+bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"`
+libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"`
+octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"`
+
+includedir=`echo "@includedir@" | sed "s|^${prefix}/||"`
+octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"`
+
+srcdir="@srcdir@"
+top_srcdir="@top_srcdir@"
+abs_srcdir="@abs_srcdir@"
+abs_top_srcdir="@abs_top_srcdir@"
+
 NO_OCT_FILE_STRIP="@NO_OCT_FILE_STRIP@"
 AMD_CPPFLAGS="@AMD_CPPFLAGS@"
 AMD_LDFLAGS="@AMD_LDFLAGS@"
@@ -182,16 +197,6 @@
 Z_LIBS="@Z_LIBS@"
 config_opts="@config_opts@"
 
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-
-bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"`
-libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"`
-octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"`
-
-includedir=`echo "@includedir@" | sed "s|^${prefix}/||"`
-octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"`
-
 $SED \
   -e "s|%NO_EDIT_WARNING%|DO NOT EDIT!  Generated automatically by subst-config-vals.|" \
   -e "s|%NO_OCT_FILE_STRIP%|${NO_OCT_FILE_STRIP}|" \
--- a/configure.ac	Tue Apr 24 18:32:22 2018 -0700
+++ b/configure.ac	Thu Apr 26 06:49:06 2018 -0400
@@ -2480,11 +2480,13 @@
   [cs${CXSPARSE_TAG}sqr],
   [C++], [don't use CXSparse library, disable some sparse matrix functionality])
 
-## Additional check for CXSparse version >= 2.2
-if test $octave_cv_lib_cxsparse = yes; then
-  OCTAVE_CHECK_CXSPARSE_VERSION_OK
-  if test $octave_cv_cxsparse_version_ok = no; then
-    AC_MSG_ERROR([CXSparse library is too old (< version 2.2).  Upgrade CXSparse (SuiteSparse) or configure Octave with --disable-cxsparse"])
+if test -z "$warn_cxsparse"; then
+  ## Additional check for CXSparse version >= 2.2
+  if test $octave_cv_lib_cxsparse = yes; then
+    OCTAVE_CHECK_CXSPARSE_VERSION_OK
+    if test $octave_cv_cxsparse_version_ok = no; then
+      AC_MSG_ERROR([CXSparse library is too old (< version 2.2).  Upgrade CXSparse (SuiteSparse) or configure Octave with --disable-cxsparse"])
+    fi
   fi
 fi
 
--- a/doc/interpreter/module.mk	Tue Apr 24 18:32:22 2018 -0700
+++ b/doc/interpreter/module.mk	Thu Apr 26 06:49:06 2018 -0400
@@ -197,25 +197,64 @@
 %reldir%/octave.pdf: $(DOC_IMAGES_PDF) $(octave_TEXINFOS)
 $(OCTAVE_HTML_STAMP): $(DOC_IMAGES_PNG) $(octave_TEXINFOS)
 
+endif
+
+## Even if Octave was configured with --disable-docs, we will install
+## OCTAVE_QTHELP_FILES if they already exist.
+
+## Don't add these files to octdoc_DATA.  We want custom rules for
+## installing them.
+OCTAVE_QTHELP_FILES = \
+  %reldir%/octave_interpreter.qhc \
+  %reldir%/octave_interpreter.qch
+
+install-data-local: install-qthelp-files
+
+uninstall-local: uninstall-qthelp-files
+
+## Don't depend on $(OCTAVE_QTHELP_FILES) because we don't want to fail
+## if they can't be generated, but we want to install them if they exist
+## anyway (for example, they were included with a tarball distribution
+## file).
+install-qthelp-files: qthelp-installdir
+	@for f in $(OCTAVE_QTHELP_FILES); do \
+	  if [ -f $$f ]; then \
+	    echo " $(INSTALL_DATA) $$f '$(DESTDIR)$(octdocdir)'"; \
+	    $(INSTALL_DATA) $$f '$(DESTDIR)$(octdocdir)'; \
+	  elif [ -f $(srcdir)/$$f ]; then \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$f '$(DESTDIR)$(octdocdir)'"; \
+	    $(INSTALL_DATA) $(srcdir)/$$f '$(DESTDIR)$(octdocdir)'; \
+	  else \
+	    echo "warning: unable to install $$f"; \
+	  fi; \
+	done
+.PHONY: install-qthelp-files
+
+uninstall-qthelp-files:
+	for f in $(OCTAVE_QTHELP_FILES); do \
+	  base=`echo $$f | $(SED) 's,^%reldir%/,,'`; \
+	  rm -f $(DESTDIR)$(octdocdir)/$$base; \
+	done
+.PHONY: uninstall-qthelp-files
+
+qthelp-installdir:
+	$(MKDIR_P) '$(DESTDIR)/$(octdocdir)'
+.PHONY: qthelp-installdir
+
+if AMCOND_BUILD_DOCS
+
 if AMCOND_BUILD_QT_DOCS
 
-OCTAVE_QTHELP_FILES = %reldir%/octave_interpreter.qhc %reldir%/octave_interpreter.qch
+## The Qt help collection generator command produces two output files
+## with the same base name.  Use a pattern rule so that GNU Make will
+## only invoke the rule once to generate both files.
 
-octdoc_DATA += \
-  $(OCTAVE_QTHELP_FILES)
-
-$(OCTAVE_QTHELP_FILES): $(OCTAVE_HTML_STAMP) $(HTMLDIR_CSS) %reldir%/mk-qthelp.pl
+%.qhc %.qch : $(OCTAVE_HTML_STAMP) $(HTMLDIR_CSS) %reldir%/mk-qthelp.pl
 	$(AM_V_GEN)rm -f $(OCTAVE_QTHELP_FILES) && \
 	$(PERL) $(srcdir)/%reldir%/mk-qthelp.pl octave.html %reldir%/octave_interpreter && \
 	$(QCOLLECTIONGENERATOR) $(QCOLLECTIONGENERATORFLAGS) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \
 	rm -f %reldir%/octave_interpreter.qhcp %reldir%/octave_interpreter.qhp
 
-## The Qt help collection generator command produces two output files
-## with the same base name: the compressed help (qch) file and the help
-## collection (qhc) file.  Declare the qhc file to depend on the
-## associated qch file, so that the files are built serially.
-%reldir%/octave_interpreter.qhc: %reldir%/octave_interpreter.qch
-
 endif
 
 $(srcdir)/%reldir%/octave.info: %reldir%/octave.texi $(srcdir)/%reldir%/version-octave.texi
@@ -279,8 +318,12 @@
   %reldir%/octave.pdf \
   $(OCTAVE_HTML_STAMP) \
   $(HTMLDIR_IMAGES) \
-  $(HTMLDIR_CSS) \
+  $(HTMLDIR_CSS)
+
+if AMCOND_BUILD_QT_DOCS
+DOC_TARGETS += \
   $(OCTAVE_QTHELP_FILES)
+endif
 
 ## Distribute both OCTAVE_CSS and HTMLDIR_CSS so that the rules for
 ## building HTMLDIR_CSS work properly.
--- a/doc/interpreter/octave.texi	Tue Apr 24 18:32:22 2018 -0700
+++ b/doc/interpreter/octave.texi	Thu Apr 26 06:49:06 2018 -0400
@@ -24,14 +24,10 @@
 
 @include macros.texi
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Octave: (octave).           Interactive language for numerical computations.
-
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
+@dircategory Math
+@direntry
+* Octave: (octave).             Interactive language for numerical computations.
+@end direntry
 
 @c Settings for printing on 8-1/2 by 11 inch paper (default):
 @c --------------------------------------------------------
--- a/doc/liboctave/liboctave.texi	Tue Apr 24 18:32:22 2018 -0700
+++ b/doc/liboctave/liboctave.texi	Thu Apr 26 06:49:06 2018 -0400
@@ -20,13 +20,10 @@
 \input texinfo
 @setfilename liboctave.info
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* liboctave: (liboctave). Octave C++ Classes
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
+@dircategory Math
+@direntry
+* liboctave: (liboctave).       Octave C++ Classes
+@end direntry
 
 @c @smallbook
 @c @setchapternewpage odd
--- a/libinterp/corefcn/sysdep.cc	Tue Apr 24 18:32:22 2018 -0700
+++ b/libinterp/corefcn/sysdep.cc	Thu Apr 26 06:49:06 2018 -0400
@@ -1026,25 +1026,18 @@
 @seealso{input, pause}
 @end deftypefn */)
 {
-  octave_value retval = "";
-
   // FIXME: add timeout and default value args?
 
-  if (octave::application::interactive ())
-    {
-      Fdrawnow ();
+  Fdrawnow ();
 
-      int c = octave_kbhit (args.length () == 0);
+  int c = octave_kbhit (args.length () == 0);
 
-      if (c == -1)
-        c = 0;
-
-      char s[2] = { static_cast<char> (c), '\0' };
+  if (c == -1)
+    c = 0;
 
-      retval = s;
-    }
+  char s[2] = { static_cast<char> (c), '\0' };
 
-  return retval;
+  return octave_value (s);
 }
 
 DEFUN (pause, args, ,
--- a/m4/acinclude.m4	Tue Apr 24 18:32:22 2018 -0700
+++ b/m4/acinclude.m4	Thu Apr 26 06:49:06 2018 -0400
@@ -2936,7 +2936,7 @@
   fi
 
   if test $tmp_have_bison = no; then
-    YACC='$(top_srcdir)/build-aux/missing bison'
+    YACC='${top_srcdir}/build-aux/missing bison'
     warn_bison="
 
 I didn't find bison, or the version of bison that I found does not
@@ -2974,7 +2974,7 @@
       LEXLIB=
     ;;
     *)
-      LEX='$(top_srcdir)/build-aux/missing flex'
+      LEX='${top_srcdir}/build-aux/missing flex'
       warn_flex="
 
 I didn't find flex, but it's only a problem if you need to reconstruct
@@ -2999,7 +2999,7 @@
   esac
   AC_CHECK_PROGS(GHOSTSCRIPT, [$ac_octave_gs_names])
   if test -z "$GHOSTSCRIPT"; then
-    GHOSTSCRIPT='$(top_srcdir)/build-aux/missing gs'
+    GHOSTSCRIPT='${top_srcdir}/build-aux/missing gs'
     warn_ghostscript="
 
 I didn't find ghostscript, so reconstructing figures for the manual
@@ -3040,14 +3040,14 @@
 AC_DEFUN([OCTAVE_PROG_GPERF], [
   AC_CHECK_PROG(GPERF, gperf, gperf, [])
   if test -z "$GPERF"; then
-    GPERF='$(top_srcdir)/build-aux/missing gperf'
+    GPERF='${top_srcdir}/build-aux/missing gperf'
     warn_gperf="
 
 I didn't find gperf, but it's only a problem if you need to
 reconstruct oct-gperf.h
 "
     OCTAVE_CONFIGURE_WARNING([warn_gperf])
-    GPERF='$(top_srcdir)/build-aux/missing gperf'
+    GPERF='${top_srcdir}/build-aux/missing gperf'
   fi
   AC_SUBST(GPERF)
 ])
@@ -3057,7 +3057,7 @@
 AC_DEFUN([OCTAVE_PROG_ICOTOOL], [
   AC_CHECK_PROG(ICOTOOL, icotool, icotool, [])
   if test -z "$ICOTOOL"; then
-    ICOTOOL='$(top_srcdir)/build-aux/missing icotool'
+    ICOTOOL='${top_srcdir}/build-aux/missing icotool'
     warn_icotool="
 
 I didn't find icotool, but it's only a problem if you need to
@@ -3166,7 +3166,7 @@
 AC_DEFUN([OCTAVE_PROG_RSVG_CONVERT], [
   AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert, [])
   if test -z "$RSVG_CONVERT"; then
-    RSVG_CONVERT='$(top_srcdir)/build-aux/missing rsvg-convert'
+    RSVG_CONVERT='${top_srcdir}/build-aux/missing rsvg-convert'
     warn_rsvg_convert="
 
 I didn't find rsvg-convert, but it's only a problem if you need to
@@ -3274,7 +3274,7 @@
 AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [
   AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
   if test -z "$TEXI2DVI"; then
-    TEXI2DVI='$(top_srcdir)/build-aux/missing texi2dvi'
+    TEXI2DVI='${top_srcdir}/build-aux/missing texi2dvi'
     warn_texi2dvi="
 
 I didn't find texi2dvi, but it's only a problem if you need to
@@ -3300,7 +3300,7 @@
     ac_octave_texi2pdf_missing=no;
   fi
   if test $ac_octave_texi2pdf_missing = yes; then
-    TEXI2PDF='$(top_srcdir)/build-aux/missing texi2pdf'
+    TEXI2PDF='${top_srcdir}/build-aux/missing texi2pdf'
     warn_texi2pdf="
 
 I didn't find texi2pdf, but it's only a problem if you need to