--- a/mkoctfile.in	Fri Oct 11 20:57:21 2002 +0000
+++ b/mkoctfile.in	Mon Oct 14 20:16:45 2002 +0000
@@ -37,7 +37,8 @@
 : ${RLD_FLAG=%OCTAVE_CONF_RLD_FLAG%}
 : ${RDYNAMIC_FLAG=%OCTAVE_CONF_RDYNAMIC_FLAG%}
 : ${LIBOCTAVE=%OCTAVE_CONF_LIBOCTAVE%}
-: ${LIBOCT_READLINE=%OCTAVE_CONF_LIBOCT_READLINE%}
+: ${LIBOCTINTERP=%OCTAVE_CONF_LIBOCTINTERP%}
+: ${LIBREADLINE=%OCTAVE_CONF_LIBREADLINE%}
 : ${LIBCRUFT=%OCTAVE_CONF_LIBCRUFT%}
 : ${BLAS_LIBS=%OCTAVE_CONF_BLAS_LIBS%}
 : ${FFTW_LIBS=%OCTAVE_CONF_FFTW_LIBS%}
@@ -47,6 +48,7 @@
 : ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%}
 : ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%}
 : ${LFLAGS=%OCTAVE_CONF_MKOCTFILE_LFLAGS%}
+: ${INCLUDE_LINK_DEPS=%OCTAVE_CONF_INCLUDE_LINK_DEPS%}
 
 : ${ALL_FFLAGS="$FFLAGS"}
 
@@ -56,7 +58,7 @@
 
 : ${ALL_LDFLAGS="$LD_STATIC_FLAG $CPICFLAG $LDFLAGS"}
 
-: ${OCTAVE_LIBS="$LIBOCTAVE $LIBOCT_READLINE $SPECIAL_MATH_LIB $LIBCRUFT"}
+: ${OCTAVE_LIBS="$LIBOCTAVE $SPECIAL_MATH_LIB $LIBCRUFT"}
 
 # Local variables.
 
@@ -133,24 +135,26 @@
   -p VAR, --print VAR     Print configuration variable VAR.  Recognized
                           variables are:
 
-                            CPPFLAGS    CPICFLAG
-                            INCFLAGS    CXX
-                            F2C         CXXFLAGS
-                            F2CFLAGS    CXXPICFLAG
-                            F77         XTRA_CFLAGS
-                            FFLAGS      XTRA_CXXFLAGS
-                            FPICFLAG    SHLEXT
-                            CC          SH_LD
-                            CFLAGS      SH_LDFLAGS
+                            CPPFLAGS      CPICFLAG
+                            INCFLAGS      CXX
+                            F2C           CXXFLAGS
+                            F2CFLAGS      CXXPICFLAG
+                            F77           XTRA_CFLAGS
+                            FFLAGS        XTRA_CXXFLAGS
+                            FPICFLAG      SHLEXT
+                            CC            SH_LD
+                            CFLAGS        SH_LDFLAGS
 
-                            LD_CXX      LFLAGS
-                            LDFLAGS     LD_STATIC_FLAG
-                            RLD_FLAG    RDYNAMIC_FLAG
+                            INCLUDE_LINK_DEPS
 
-                            LIBOCTAVE   LIBOCT_READLINE
-                            LIBCRUFT    BLAS_LIBS
-                            FFTW_LIBS   LIBS
-                            FLIBS       OCTAVE_LIBS
+                            LD_CXX        LFLAGS
+                            LDFLAGS       LD_STATIC_FLAG
+                            RLD_FLAG      RDYNAMIC_FLAG
+
+                            LIBOCTAVE     LIBCRUFT
+                            LIBOCTINTERP  OCTAVE_LIBS
+                            BLAS_LIBS     FFTW_LIBS
+                            LIBS          FLIBS
 
   --link-stand-alone      Link a stand-alone executable file.
 
@@ -369,7 +373,7 @@
 if $link; then
   if $link_stand_alone; then
     if [ -n "$LD_CXX" ]; then
-      cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $output_option $objfiles $ldflags $LFLAGS $RLD_FLAG $OCTAVE_LIBS $BLAS_LIBS $FFTW_LIBS $LIBS $FLIBS"
+      cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $output_option $objfiles $ldflags $LFLAGS $RLD_FLAG $OCTAVE_LIBS $BLAS_LIBS $FFTW_LIBS $LIBREADLINE $LIBS $FLIBS"
       $dbg $cmd
       eval $cmd
     else
@@ -377,7 +381,11 @@
       exit 1
     fi
   else
-    cmd="$SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags"
+    LINK_DEPS=
+    if $INCLUDE_LINK_DEPS ; then
+	LINK_DEPS="$LFLAGS $LIBOCTAVE $LIBCRUFT $LIBOCTINTERP $BLAS_LIBS $FFTW_LIBS"
+    fi
+    cmd="$SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags $LINK_DEPS"
     $dbg $cmd
     eval $cmd
   fi