--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_REVISION($Revision: 1.104 $)
+AC_REVISION($Revision: 1.105 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -44,13 +44,27 @@
 
 AC_ARG_WITH(f2c,
   [  --with-f2c              use f2c even if Fortran compiler is available],
-  use_f2c=true, use_f2c=false)
+  [if test $withval = no; then use_f2c=false; else use_f2c=true; fi],
+  use_f2c=false)
+
+### Allow the user to force us to use g77.
+
+AC_ARG_WITH(g77,
+  [  --with-g77              use g77 to compile Fortran subroutines],
+  [if test $withval = no; then use_g77=false; else use_g77=true; fi],
+  use_g77=false)
+
+if $use_f2c && $use_g77; then
+  AC_MSG_WARN([--with-f2c and --with-g77 both specified!  Using g77...])
+  use_f2c=false
+fi
 
 ### Allow the user to experiment with dynamic linking using GNU dld.
 
 AC_ARG_ENABLE(dld,
   [  --enable-dld            use DLD for dynamic linking (not all systems)],
-  use_dld=true, use_dld=false)
+  [if test $enableval = no; then use_dld=false; else use_dld=true; fi],
+  use_dld=false)
 AC_SUBST(use_dld)
 
 ### Allow compilation of smaller kernel.  This only works if some form
@@ -58,7 +72,8 @@
 
 AC_ARG_ENABLE(lite-kernel,
   [  --enable-lite-kernel    compile smaller kernel (requires DLD)],
-  lite_kernel=true, lite_kernel=false)
+  [if test $enableval = no; then lite_kernel=false; else lite_kernel=true; fi],
+  lite_kernel=false)
 if $lite_kernel; then
   AC_DEFINE(OCTAVE_LITE, 1)
 fi
@@ -70,11 +85,7 @@
 LIBINFO=../info/libinfo.a
 AC_ARG_ENABLE(info,
   [  --enable-info           use GNU info (default is yes)],
-  [])
-if test "$enableval" = no; then
-  USE_GNU_INFO=false
-  LIBINFO=
-fi
+  [if test $enableval = no; then USE_GNU_INFO=false; LIBINFO=""; fi], [])
 AC_SUBST(USE_GNU_INFO)
 AC_SUBST(LIBINFO)
 
@@ -85,11 +96,7 @@
 LIBREADLINE=../readline/libreadline.a
 AC_ARG_ENABLE(readline,
   [  --enable-readline       use readline library (default is yes)],
-  [])
-if test "$enableval" = no; then
-  USE_READLINE=false
-  LIBREADLINE=
-fi
+  [if test "$enableval" = no; then USE_READLINE=false; LIBREADLINE=""; fi], [])
 AC_SUBST(USE_READLINE)
 AC_SUBST(LIBREADLINE)
 
@@ -394,6 +401,14 @@
 ###
 ### I don't think the Cray compiler will ever work like f2c...
 
+if $use_g77; then
+  F77=g77
+fi
+
+if test -n "$F77"; then 
+  export F77
+fi
+
 if $use_f2c; then
   true
 else
@@ -437,11 +452,16 @@
 fi
 
 if test -n "$F77"; then
+  if test "$F77" = "g77"; then
+    FUGLY=-fugly
+    AC_MSG_RESULT([defining FUGLY to be $FUGLY])
+  fi
   export F77
   FLIBS=`sh $srcdir/flibs.sh`
   AC_MSG_RESULT([defining FLIBS to be $FLIBS])
   DOT_C_FROM_DOT_F_CMD=
-  DOT_O_FROM_DOT_F_PAT=
+  DOT_O_FROM_DOT_F_PAT='.f.o:'
+  DOT_O_FROM_DOT_F_CMD='	$(FC) -c $(ALL_FFLAGS) $<'
 elif test -n "$F2C" || $use_f2c; then
   AC_CHECK_LIB(f2c, main, FLIBS=-lf2c, [])
   if test -z "$FLIBS" ; then
@@ -456,6 +476,7 @@
   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])
   AC_DEFINE(F77_APPEND_UNDERSCORE, 1)
 else
@@ -469,11 +490,13 @@
 AC_SUBST(FC)
 AC_SUBST(F77)
 AC_SUBST(FFLAGS)
+AC_SUBST(FUGLY)
 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)
 
 ### Extract libraries and directories from FLIBS and CXXLIBS.
 ###