Index: mttroot/mtt/bin/mttrc
==================================================================
--- mttroot/mtt/bin/mttrc
+++ mttroot/mtt/bin/mttrc
@@ -13,10 +13,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.34  2002/05/08 14:51:03  geraint
+## Moved matlab/octave data type conversion functions to a separate file.
+##
 ## Revision 1.33  2002/05/08 11:39:36  gawthrop
 ## Added MTT_REP to PATH
 ##
 ## Revision 1.32  2002/05/07 23:50:34  geraint
 ## Preliminary support for Matlab dynamically linked shared objects:
@@ -220,14 +223,19 @@
 
     IOCTAVE="-I${PREFIX}/include/octave/ -I${PREFIX}/include/octave/octave"
 
     # library paths
 
-    OCTAVEVERS=`octave --version | gawk '{ print $4 }'`
-    LOCTAVE="-L${PREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp -Wl,--rpath,${PREFIX}/lib/octave-${OCTAVEVERS}"
+    OCTAVEVERS=`octave --version | head -1 | gawk '{ print $4 }'`
+    OCTAVEMINOR=`echo ${OCTAVEVERS} | gawk -F\. '{print $2}'`
+    if [ "${OCTAVEMINOR}" = "0" ] ; then # stable
+	LOCTAVE="-L${PREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp -Wl,--rpath,${PREFIX}/lib/octave-${OCTAVEVERS}"
+    else
+	LOCTAVE="-L${PREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp -Wl,--rpath,${PREFIX}/lib/octave-${OCTAVEVERS} -loct-pathsearch -loct-readline"
+    fi
     LSYSTEM="-ldl -lm -lncurses -lkpathsea -lreadline -lblas -llapack -lfftw -lg2c"
-
+    
     # compiler options
 
     DEBUG="-g"
     OPTIM="-O3"
     FLAGS="-fno-rtti -fno-exceptions -fno-implicit-templates"