Changeset 6688 for branches/1.7/cf/rpLangOctave.m4

Timestamp:

Jan 30, 2018 10:29:24 AM (4 years ago)

Author:

clarksm

Message:

Add support for octave series 4

File:

• branches/1.7/cf/rpLangOctave.m4 (modified) (3 diffs)

branches/1.7/cf/rpLangOctave.m4

@@ -34 +34 @@
 MKOCTFILE2=
 MKOCTFILE3=
+MKOCTFILE4=
 
 if test "$with_octave" != "no" ; then
@@ -48 +49 @@
   OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
   OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+  if test "${OCTAVE_VERSION_MAJOR}" == "4" ; then
+    OCTAVE4=$OCTAVE
+    MKOCTFILE4=$MKOCTFILE
+  fi
   if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
     OCTAVE3=$OCTAVE
@@ -71 +76 @@
 # not both.  
 #
+
+# Check if octave4 was designated *in addition* to the installed version.
+# This can override the default version if they are the same versions.
+
+AC_ARG_WITH(
+    [mkoctfile4],
+    [AS_HELP_STRING([--with-mkoctfile4[=DIR]],
+        [path of octave compiler `mkoctfile' @<:@default=no@:>@])],
+    [],
+    [with_mkoctfile4=no])
+
+if test "$with_mkoctfile4" != "no" ; then
+  if test "$with_mkoctfile4" = "yes" ; then
+    AC_PATH_PROG(mkoctfile4, mkoctfile)
+  else 
+    MKOCTFILE4=$with_mkoctfile4
+  fi
+  OCTAVE_VERSION=`${MKOCTFILE4} --version 2>&1 | cut -d' ' -f3`
+  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+fi
 
 # Check if octave3 was designated *in addition* to the installed version.