--- configure.orig	2016-11-11 16:04:30 UTC
+++ configure
@@ -4193,7 +4193,7 @@ if ${ac_cv_path_NROFF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $NROFF in
-  [\\/]* | ?:[\\/]*)
+  [\\/]* | ?:[\\/]* | echo)
   ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path.
   ;;
   *)
@@ -7408,7 +7408,7 @@ $as_echo "$as_me: WARNING: Ignoring libraries \"$X_PRE
 	LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-	LDFLAGS="$X_LIBS $LDFLAGS"
+	LDFLAGS="$LDFLAGS $X_LIBS"
 	DSOFLAGS="$X_LIBS $DSOFLAGS"
 	$as_echo "#define USE_X11 1" >>confdefs.h
 
@@ -8276,16 +8276,9 @@ if test -n "$GCC"; then
 	#       They all seem to make either no difference or enlarge
 	#       the code by a few hundred bytes.
 	#
-	#       "-Os" seems to be the best compromise between speed and
-	#       code size.  "-O3" and higher seem to make no effective
-	#       difference in the speed of the code, but does bloat the
-	#       library 10+%.
-	#
 
 	if test "x$with_optim" != x; then
 	    OPTIM="$with_optim $OPTIM"
-	else
-	    OPTIM="-Os $OPTIM"
 	fi
     fi