Changeset 2189 for trunk/configure

Timestamp:

Mar 31, 2011, 3:16:43 PM (14 years ago)

Author:

gah

Message:

 

File:

• trunk/configure (modified) (5 diffs)

trunk/configure

@@ -660 +660 @@
 OCTAVE_VERSION_MAJOR
 OCTAVE_VERSION
+mkoctfile2
 mkoctfile3
-mkoctfile2
 MKOCTFILE
 OCTAVE
@@ -777 +777 @@
 with_matlab
 with_octave
+with_mkoctfile3
 with_mkoctfile2
-with_mkoctfile3
 with_perl
 with_python
@@ -1430 +1430 @@
   --with-octave=DIR       path of default octave compiler `mkoctfile'
                           [default=yes]
+  --with-mkoctfile3=DIR   path of octave compiler `mkoctfile' [default=no]
   --with-mkoctfile2=DIR   path of octave compiler `mkoctfile' [default=no]
-  --with-mkoctfile3=DIR   path of octave compiler `mkoctfile' [default=no]
   --with-perl=DIR         location of perl [default=yes]
   --with-python=DIR       location of python [default=yes]
@@ -7771 +7771 @@
 fi
 
+#
+# Check for octave3 before octave2 so that we can override the
+# OCTAVE_VERSION variables.
+#
+# Rappture doesn't normally really support both octave2 and octave3
+# simultaneously.  NANOhub has a hacked version of octave3 that
+# looks for OCTAVE_LOADPATH before looking at OCTAVE_PATH (i.e.
+# OCTAVE_PATH tells octave2 where to load the rappture bindings
+# and OCTAVE_LOADPATH tells octave3 where to load).
+#
+# Usually you will have installed either octave2 or octave3, but
+# not both.
+#
+
+# Check if octave3 was designated *in addition* to the installed version.
+# This can override the default version if they are the same versions.
+
+# Check whether --with-mkoctfile3 was given.
+if test "${with_mkoctfile3+set}" = set; then :
+  withval=$with_mkoctfile3; rp_with_mkoctfile3=$withval
+else
+  rp_with_mkoctfile3=no
+fi
+
+
+if test "$rp_with_mkoctfile3" != "no" ; then
+  if test "$rp_with_mkoctfile3" = "yes" ; then
+    # Extract the first word of "mkoctfile", so it can be a program name with args.
+set dummy mkoctfile; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_mkoctfile3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $mkoctfile3 in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_mkoctfile3="$mkoctfile3" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_mkoctfile3="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+mkoctfile3=$ac_cv_path_mkoctfile3
+if test -n "$mkoctfile3"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile3" >&5
+$as_echo "$mkoctfile3" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MKOCTFILE3=$rp_with_mkoctfile3
+  fi
+  OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3`
+  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+fi
+
 # Check if mkoctfile2 was designated *in addition* to the installed version.
 # This can override the default version if they are the same versions.
@@ -7831 +7905 @@
 fi
 
-# Check if octave3 was designated *in addition* to the installed version.
-# This can override the default version if they are the same versions.
-
-# Check whether --with-mkoctfile3 was given.
-if test "${with_mkoctfile3+set}" = set; then :
-  withval=$with_mkoctfile3; rp_with_mkoctfile3=$withval
-else
-  rp_with_mkoctfile3=no
-fi
-
-
-if test "$rp_with_mkoctfile3" != "no" ; then
-  if test "$rp_with_mkoctfile3" = "yes" ; then
-    # Extract the first word of "mkoctfile", so it can be a program name with args.
-set dummy mkoctfile; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_mkoctfile3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $mkoctfile3 in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_mkoctfile3="$mkoctfile3" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_mkoctfile3="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-mkoctfile3=$ac_cv_path_mkoctfile3
-if test -n "$mkoctfile3"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile3" >&5
-$as_echo "$mkoctfile3" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MKOCTFILE3=$rp_with_mkoctfile3
-  fi
-  OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3`
-  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
-fi
 
 echo "MKOCTFILE2 = $MKOCTFILE2"