--- a/configure.in	Tue Dec 26 04:15:08 1995 +0000
+++ b/configure.in	Tue Dec 26 06:40:29 1995 +0000
@@ -20,7 +20,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-AC_REVISION($Revision: 1.144 $)
+AC_REVISION($Revision: 1.145 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -352,6 +352,9 @@
 AC_MSG_RESULT([defining FPICFLAG to be $FPICFLAG])
 AC_MSG_RESULT([defining CPICFLAG to be $CPICFLAG])
 AC_MSG_RESULT([defining CXXPICFLAG to be $CXXPICFLAG])
+AC_SUBST(FPICFLAG)
+AC_SUBST(CPICFLAG)
+AC_SUBST(CXXPICFLAG)
 
 ### Allow compilation of smaller kernel.  This only works if some form
 ### of dynamic linking is also supported and used.
@@ -494,10 +497,19 @@
   fi
 fi
 
+fortran_rules_frag=Makerules.f77
 if $have_fortran_compiler; then
-  DOT_C_FROM_DOT_F_CMD=
-  DOT_O_FROM_DOT_F_PAT='.f.o:'
-  DOT_O_FROM_DOT_F_CMD='	$(FC) -c $(ALL_FFLAGS) $<'
+  cat << \EOF > $fortran_rules_frag
+
+.c.f:
+
+.f.o:
+	if [ -z "$(FPICFLAG)" ] && [ -f pic ]; then \
+	  $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o pic/$@; \
+	else true; fi
+	$(FC) -c $(ALL_FFLAGS) $<'
+
+EOF
 elif $have_f2c; then
   AC_DEFINE(F77_APPEND_UNDERSCORE, 1)
   AC_MSG_RESULT([defining F77_APPEND_UNDERSCORE to be 1])
@@ -511,11 +523,14 @@
   if test -z "$FLIBS"; then
     AC_MSG_WARN([I found f2c but not libf2c.a, or libF77.a and libI77.a])
   fi
-  DOT_C_FROM_DOT_F_CMD='	cat $< | $(F2C) $(F2CFLAGS) > $(@F)'
-  AC_MSG_RESULT([defining DOT_C_FROM_DOT_F_CMD to be $DOT_C_FROM_DOT_F_CMD])
-  DOT_O_FROM_DOT_F_PAT='%.o : %.f'
-  DOT_O_FROM_DOT_F_CMD=
-  AC_MSG_RESULT([defining DOT_O_FROM_DOT_F_PAT to be $DOT_O_FROM_DOT_F_PAT])
+  cat << \EOF > $fortran_rules_frag
+
+.c.f:
+	cat $< | $(F2C) $(F2CFLAGS) > $(@F)
+
+%.o : %.f
+
+EOF
 else
   AC_MSG_WARN([in order to build octave, you must have a compatible])
   AC_MSG_WARN([Fortran compiler or f2c installed and in your path.])
@@ -530,9 +545,7 @@
 AC_SUBST(FLIBS)
 AC_SUBST(F2C)
 AC_SUBST(F2CFLAGS)
-AC_SUBST(DOT_C_FROM_DOT_F_CMD)
-AC_SUBST(DOT_O_FROM_DOT_F_PAT)
-AC_SUBST(DOT_O_FROM_DOT_F_CMD)
+AC_SUBST_FILE(fortran_rules_frag)
 
 ### Extract libraries and directories from FLIBS and CXXLIBS.
 ###
@@ -903,12 +916,21 @@
 export CXX
 export F77
 
-AC_CONFIG_SUBDIRS(kpathsea libcruft scripts $INFO_DIR $PLPLOT_DIR $READLINE_DIR)
+AC_CONFIG_SUBDIRS(kpathsea scripts $INFO_DIR $PLPLOT_DIR $READLINE_DIR)
 
 ### Do the substitutions in all the Makefiles.
 
 AC_OUTPUT(Makefile octMakefile Makeconf liboctave/Makefile
-	  src/Makefile dld/Makefile doc/Makefile test/Makefile)
+	  src/Makefile dld/Makefile doc/Makefile test/Makefile
+	  libcruft/Makefile libcruft/Makerules libcruft/blas/Makefile
+	  libcruft/balgen/Makefile libcruft/dassl/Makefile
+	  libcruft/eispack/Makefile libcruft/fftpack/Makefile
+	  libcruft/fsqp/Makefile libcruft/lapack/Makefile
+	  libcruft/linpack/Makefile libcruft/minpack/Makefile
+	  libcruft/misc/Makefile libcruft/npsol/Makefile
+	  libcruft/odepack/Makefile libcruft/qpsol/Makefile
+	  libcruft/quadpack/Makefile libcruft/ranlib/Makefile
+	  libcruft/slatec-fn/Makefile libcruft/villad/Makefile)
 
 ### Print a summary so that important information isn't missed.
 
@@ -935,6 +957,7 @@
   Default pager:        $DEFAULT_PAGER
   gnuplot:              $GNUPLOT_BINARY
 
+  Build shared libraries:                  $shared_libs
   Minimal kernel option:                   $lite_kernel
   Dynamic Linking (dld):                   $use_dld
   Dynamic Linking (dlopen/dlsym):          $use_dl