Changeset 2181

Timestamp:

Mar 31, 2011 11:35:12 AM (13 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• configure (modified) (4 diffs)
• configure.in (modified) (4 diffs)

trunk/configure

@@ -7637 +7637 @@
 # Octave variables:
 #
-#       OCTAVE          Path to default octave executable.  Will use
-#                       to determine the version os
-#       MKOCTFILE       Path to the default octave
+#       OCTAVE                  Path to default octave executable.  Will use
+#                               to determine the version.
+#       OCTAVE_VERSION          Full version of octave (X.X.X).  Used in
+#                               Makefiles to indicate if we are building
+#                               the octave language bindings.  The empty
+#                               string indicates octave is not available.
+#       OCTAVE_VERSION_MAJOR    Single verion number of octave.  Used in
+#                               rappture.env scripts to indicate how to set
+#                               OCTAVE_PATH and OCTAVE_LOADPATH variables.
+#       MKOCTFILE               Path to the default octave compiler.  This
+#                               variable isn't used directly.  Either
+#                               MKOCTFILE2 or MKOCTFILE3 will be set to its
+#                               value.
+#       MKOCTFILE2              Path to octave version 2 compiler.
+#       MKOCTFILE3              Path to octave version 3 compiler.
 #
 
@@ -7760 +7772 @@
 
 # Check if mkoctfile2 was designated *in addition* to the installed version.
+# This can override the default version if they are the same versions.
 
 # Check whether --with-mkoctfile2 was given.
@@ -7819 +7832 @@
 
 # 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.
@@ -7880 +7894 @@
 echo "MKOCTFILE3 = $MKOCTFILE3"
 echo "OCTAVE_VERSION_MAJOR = $OCTAVE_VERSION_MAJOR"
-echo "OCTAVE_VERSION = $OCTAVE_VERSION_MAJOR"
-
+echo "OCTAVE_VERSION = $OCTAVE_VERSION"
 
 

trunk/configure.in

@@ -265 +265 @@
 # Octave variables:
 #
-#       OCTAVE          Path to default octave executable.  Will use
-#                       to determine the version os 
-#       MKOCTFILE       Path to the default octave 
+#       OCTAVE                  Path to default octave executable.  Will use
+#                               to determine the version.
+#       OCTAVE_VERSION          Full version of octave (X.X.X).  Used in 
+#                               Makefiles to indicate if we are building 
+#                               the octave language bindings.  The empty
+#                               string indicates octave is not available.
+#       OCTAVE_VERSION_MAJOR    Single verion number of octave.  Used in 
+#                               rappture.env scripts to indicate how to set 
+#                               OCTAVE_PATH and OCTAVE_LOADPATH variables.
+#       MKOCTFILE               Path to the default octave compiler.  This
+#                               variable isn't used directly.  Either 
+#                               MKOCTFILE2 or MKOCTFILE3 will be set to its
+#                               value.
+#       MKOCTFILE2              Path to octave version 2 compiler.
+#       MKOCTFILE3              Path to octave version 3 compiler.
 #
 
@@ -308 +320 @@
 
 # Check if mkoctfile2 was designated *in addition* to the installed version.
+# This can override the default version if they are the same versions.
 AC_ARG_WITH(
     [mkoctfile2],
@@ -326 +339 @@
 
 # Check if octave3 was designated *in addition* to the installed version.
+# This can override the default version if they are the same versions.
 AC_ARG_WITH(
     [mkoctfile3],
@@ -348 +362 @@
 echo "OCTAVE_VERSION = $OCTAVE_VERSION"
 
-AC_SUBST(OCTAVE)
 AC_SUBST(OCTAVE_VERSION)
 AC_SUBST(OCTAVE_VERSION_MAJOR)