diff --git a/src/configure b/src/configure
index 3c8428ebf7..df221e0205 100755
--- a/src/configure
+++ b/src/configure
@@ -2312,7 +2312,7 @@ show_explicitly_enabled "${enable_xonx}" "Unix style"
 show_explicitly_enabled "${enable_shared}" "Shared libraries"
 
 show_explicitly_disabled "${enable_gracket}" GRacket
-show_explicitly_disabled "${enable_plot}" Plot
+show_explicitly_disabled "${enable_plot}" Plot fit library
 
 if test "$LIBTOOLPROG" != "" ; then
   echo "=== Libtool program: $LIBTOOLPROG"
@@ -4094,6 +4094,7 @@ case "$host_os" in
     fi
     ;;
   nto-qnx*)
+    enable_sgc=yes
     LIBS="$LIBS -lsocket"
     ;;
   *)
@@ -9975,7 +9976,7 @@ do
     cat >>$CONFIG_STATUS <<_ACEOF
     # First, check the format of the line:
     cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*/b def
 /^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
 b
 :def
diff --git a/src/racket/configure.ac b/src/racket/configure.ac
index ff9bd1c0a4..ce38b3eba7 100644
--- a/src/racket/configure.ac
+++ b/src/racket/configure.ac
@@ -31,6 +31,7 @@ AC_ARG_ENABLE(jit,     [  --enable-jit            support JIT compiler (enabled
 AC_ARG_ENABLE(foreign, [  --enable-foreign        support foreign calls (enabled by default)], , enable_foreign=yes)
 AC_ARG_ENABLE(places,  [  --enable-places         support places (3m only; usually enabled by default)])
 AC_ARG_ENABLE(futures, [  --enable-futures        support futures (usually enabled by default)])
+AC_ARG_ENABLE(plot,    [  --enable-plot           support plot libraries (enabled by default)], , enable_plot=yes )
 AC_ARG_ENABLE(float,   [  --enable-float          support single-precision floats (enabled by default)], , enable_float=yes)
 AC_ARG_ENABLE(floatinstead, [  --enable-floatinstead   use single-precision by default])
 
@@ -238,6 +239,7 @@ show_explicitly_enabled "${enable_xonx}" "Unix style"
 show_explicitly_enabled "${enable_shared}" "Shared libraries"
 
 show_explicitly_disabled "${enable_gracket}" GRacket
+show_explicitly_disabled "${enable_plot}" Plot fit library
 
 if test "$LIBTOOLPROG" != "" ; then
   echo "=== Libtool program: $LIBTOOLPROG"
@@ -1194,6 +1196,7 @@ AC_SUBST(MRLIBINSTALL)
 AC_SUBST(LIBFINISH)
 
 AC_SUBST(MAKE_GRACKET)
+AC_SUBST(MAKE_FIT)
 AC_SUBST(MAKE_COPYTREE)
 AC_SUBST(MAKE_FINISH)
 
@@ -1271,6 +1274,14 @@ fi
 makefiles="$makefiles foreign/Makefile"
 ac_configure_args="$ac_configure_args$SUB_CONFIGURE_EXTRAS"
 
+if test -d "${srcdir}/fit" && test "${enable_plot}" = "yes" ; then
+  makefiles="$makefiles
+             fit/Makefile"
+  MAKE_FIT=fit
+else
+  MAKE_FIT=no
+fi
+
 if test "${enable_gracket}" = "yes" ; then
   makefiles="$makefiles
              gracket/Makefile