--- a/configure.in
+++ b/configure.in
@@ -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.203 $)
+AC_REVISION($Revision: 1.205 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -592,15 +592,6 @@
 AC_SUBST(F2CFLAGS)
 AC_SUBST_FILE(f77_rules_frag)
 
-SHARED_FLIBS="$SHARED_FLIBS"
-case "$canonical_host_type" in
-  *-*-sunos4*)
-    SHARED_FLIBS=
-  ;;
-esac
-AC_MSG_RESULT([defining SHARED_FLIBS to be $SHARED_FLIBS])
-AC_SUBST(SHARED_FLIBS)
-
 ### Extract libraries and directories from FLIBS and CXXLIBS.
 ###
 ### Leave only libraries, with -lfoo converted to libfoo.a:
@@ -958,6 +949,25 @@
 
 AC_PROG_LN_S
 
+### Kluge for SunOS 4.x vs. shared libraries.
+
+SH_LIBS="$LIBS"
+SH_FLIBS="$FLIBS"
+SH_TERMLIBS="$TERMLIBS"
+case "$canonical_host_type" in
+  *-*-sunos4*)
+    SH_LIBS=
+    SH_FLIBS=
+    SH_TERMLIBS=
+  ;;
+esac
+AC_MSG_RESULT([defining SH_LIBS to be $SH_LIBS])
+AC_MSG_RESULT([defining SH_FLIBS to be $SH_FLIBS])
+AC_MSG_RESULT([defining SH_TERMLIBS to be $SH_TERMLIBS])
+AC_SUBST(SH_LIBS)
+AC_SUBST(SH_FLIBS)
+AC_SUBST(SH_TERMLIBS)
+
 AC_CHECK_PROG(RUNTEST, runtest, runtest, [])
 AC_CHECK_PROG(EXPECT, expect, expect, [])
 if test -z "$EXPECT"; then