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