--- configure.orig
+++ configure
@@ -583,10 +583,10 @@
   _osldef="$_debug $_profile $_osldef"
 elif test -z "$CFLAGS" ; then
     _cdefos="-DNDEBUG=1 -O2 -ffast-math -fomit-frame-pointer $_cdefos"
-    x86 && _cdefos="-mmmx -msse $_cdefos"
 else
     _cdefos="-DNDEBUG=1 $CFLAGS $_cdefos"
 fi
+x86 && _cdefos="-mmmx -msse $_cdefos"
 test -n "$LDFLAGS" && _osldef="$LDFLAGS $_osldef"
 test -n "$LIBS" && _osldef="$LIBS $_osldef"
 
@@ -656,10 +656,10 @@
 echocheck "slang.h"
 	check_header slang.h
 	enabled slang_h && _cdefos="-D_SLANG_ -D__OS_NAME__='\"Unix/Slang\"' $_cdefos"
-	enabled slang_h && _oslibs="-lslang $_oslibs" || disable _slang
+	enabled slang_h && _oslibs="-lslang -ltermcap $_oslibs" || disable _slang
 echores "$slang_h"
 	fi
-	if enabled _curses -a disabled _slang; then
+	if enabled _curses && disabled _slang; then
 echocheck "curses.h"
 	cat > $TMPC << EOF
 	#include <curses.h>
@@ -678,8 +678,10 @@
 	fi
 echores "$_curses"
 	fi
-	disabled _curses -a disabled _slang && _cdefos="-D_VT100_ -D__OS_NAME__='\"Unix/VT100\"' $_cdefos"
-	disabled _curses -a disabled _slang && echo "Defaulting to VT100"
+	if disabled _curses && disabled _slang ; then
+		_cdefos="-D_VT100_ -D__OS_NAME__='\"Unix/VT100\"' $_cdefos"
+		echo "Defaulting to VT100"
+	fi
 	;;
     *)
 	;;