# HG changeset patch
# User Rik <rik@octave.org>
# Date 1520933392 -3600
# Node ID ff80c319e664d0968b7ac96496c1347598f727bf
# Parent  24ae3461fb8588bdf31e34f24fcf16a0e6f18211
maint: Merge GSOC Specfun code into core

diff -r 24ae3461fb85 -r ff80c319e664 configure.ac
--- a/configure.ac	Sun Feb 25 00:19:50 2018 +0100
+++ b/configure.ac	Tue Mar 13 10:29:52 2018 +0100
@@ -172,11 +172,9 @@
 
 ## Where Octave will search for fallback font files shipped with distribution.
 OCTAVE_SET_DEFAULT([octfontsdir], '${datadir}/octave/${version}/fonts')
-
 ## Where Octave will look for startup files.
 OCTAVE_SET_DEFAULT([startupfiledir], '${fcnfiledir}/startup')
 OCTAVE_SET_DEFAULT([localstartupfiledir], '${localfcnfiledir}/startup')
-
 ## Where Octave will look for man and info files.
 OCTAVE_SET_DEFAULT([man1dir], '${mandir}/man1')
 OCTAVE_SET_DEFAULT([man1ext], '.1')
@@ -300,10 +298,8 @@
   AC_MSG_NOTICE([configuring Octave to use system fonts in $SYSTEM_FREEFONT_DIR])
   AC_DEFINE_UNQUOTED([SYSTEM_FREEFONT_DIR], ["$SYSTEM_FREEFONT_DIR"],
     [Define this to be the system directory containing the GNU FreeFont fonts.])
-fi
 AM_CONDITIONAL([AMCOND_INSTALL_INTERNAL_FONT_FILES],
   [test -z "$SYSTEM_FREEFONT_DIR"])
-
 ### Determine which C++ compiler to use (we expect to find g++).
 
 AC_PROG_CXX
@@ -2908,6 +2904,25 @@
 AM_CONDITIONAL([AMCOND_BUILD_DOCS], [test $ENABLE_DOCS = yes])
 
 ### Determine whether Mercurial ID should be embedded in library binaries.
+ENABLE_HG_ID=yes
+AC_ARG_ENABLE([hg-id],
+  [AS_HELP_STRING([--disable-hg-id],
+    [disable embedding of hg id in libraries])],
+  [if test "$enableval" = no; then ENABLE_HG_ID=no; fi], [])
+AM_CONDITIONAL([AMCOND_ENABLE_HG_ID], [test $ENABLE_HG_ID = yes])
+
+### Determine whether to install build logs with Octave.
+
+install_build_logs=no
+AC_ARG_ENABLE([install-build-logs],
+  [AS_HELP_STRING([--enable-install-build-logs],
+    [install build logs (i.e. config.log) with Octave])],
+  [if test "$enableval" = yes; then install_build_logs=yes; fi])
+AM_CONDITIONAL([AMCOND_INSTALL_BUILD_LOGS], [test $install_build_logs = yes])
+
+### Add extra compiler flags now that feature testing is complete.
+
+## Add warning flags
 
 ENABLE_HG_ID=yes
 AC_ARG_ENABLE([hg-id],
diff -r 24ae3461fb85 -r ff80c319e664 scripts/statistics/corrcoef.m
--- a/scripts/statistics/corrcoef.m	Sun Feb 25 00:19:50 2018 +0100
+++ b/scripts/statistics/corrcoef.m	Tue Mar 13 10:29:52 2018 +0100
@@ -292,3 +292,4 @@
 %!error <"alpha" must be a number between 0 and 1> corrcoef (1,2, "alpha", 2)
 %!error <"rows" must be "all"...> corrcoef (1,2, "rows", "foobar")
 %!error <Unknown option "foobar"> corrcoef (1,2, "foobar", 1)
+%!error <Unknown option "foobar"> corrcoef (1,2, "foobar", 1)