]>
Commit | Line | Data |
---|---|---|
f5d878de JR |
1 | --- plplot-5.8.0/cf/octave.ac~ 2008-04-03 19:19:20.000000000 +0200 |
2 | +++ plplot-5.8.0/cf/octave.ac 2008-04-03 19:35:38.000000000 +0200 | |
3 | @@ -84,6 +84,7 @@ | |
4 | # Get Configuration default values for Octave | |
5 | AC_MSG_CHECKING([Octave prefix]) | |
6 | PL_OCTAVE_CONFIG_INFO(OCTAVE_PREFIX, prefix) | |
7 | + OCTAVE_PREFIX=`echo $OCTAVE_PREFIX | sed 's|^[[^/]]\+/|/|'` | |
8 | AC_MSG_RESULT($OCTAVE_PREFIX) | |
9 | ||
10 | AC_MSG_CHECKING([Octave m dir]) | |
11 | --- plplot-5.8.0/cf/octave.ac~ 2007-11-18 21:04:07.000000000 +0100 | |
12 | +++ plplot-5.8.0/cf/octave.ac 2008-04-03 19:11:21.000000000 +0200 | |
13 | @@ -87,7 +87,10 @@ | |
14 | AC_MSG_RESULT($OCTAVE_PREFIX) | |
15 | ||
16 | AC_MSG_CHECKING([Octave m dir]) | |
17 | - if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then | |
18 | + if test -n "`echo $OCTAVE_VERSION | sed 's/^3.0//p;d;q'`" ; then | |
19 | + # Octave version 3.0 | |
20 | + PL_OCTAVE_CONFIG_INFO(OCTAVE_M_DIR, localfcnfiledir) | |
21 | + elif test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then | |
22 | # Octave version 2.1 | |
23 | PL_OCTAVE_CONFIG_INFO(OCTAVE_M_DIR, localfcnfiledir) | |
24 | else | |
25 | @@ -106,7 +109,10 @@ | |
26 | AC_MSG_RESULT($OCTAVE_M_DIR) | |
27 | ||
28 | AC_MSG_CHECKING([Octave oct dir]) | |
29 | - if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then | |
30 | + if test -n "`echo $OCTAVE_VERSION | sed 's/^3.0//p;d;q'`" ; then | |
31 | + # Octave version 3.0 | |
32 | + PL_OCTAVE_CONFIG_INFO(OCTAVE_OCT_DIR, localoctfiledir) | |
33 | + elif test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then | |
34 | # Octave version 2.1 | |
35 | PL_OCTAVE_CONFIG_INFO(OCTAVE_OCT_DIR, localoctfiledir) | |
36 | else |