From 287d740e3381776fb9c0923d9d144848bf75ed36 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Sat, 23 Feb 2019 03:56:13 -0500
Subject: [PATCH] Tighten it up.

---
 x11/configure    | 33 ++++++++++++---------------------
 x11/configure.ac | 22 +++++++---------------
 2 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/x11/configure b/x11/configure
index 83254b35..d3e4cffe 100755
--- a/x11/configure
+++ b/x11/configure
@@ -1356,7 +1356,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          turn on debugging
   --disable-widec         omit support for wide characters
-
   --enable-force-utf8     override locale settings; use UTF-8
 
 Optional Packages:
@@ -4425,15 +4424,13 @@ CPPFLAGS="$save_CPPFLAGS"
 
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; with_debug=$enableval
-else
-  with_debug=no
+  enableval=$enable_debug;
 fi
 
 cflags_g="`echo $CFLAGS | grep -c '\-g'`"
 cflags_O="`echo $CFLAGS | grep -c '\-O'`"
 
-if test "$with_debug" = yes; then
+if test "$enable_debug" = "yes"; then
 	if test "$cflags_g" = "0"; then
 		CFLAGS="${CFLAGS} -g"
 	fi
@@ -4450,14 +4447,14 @@ else
 	fi
 fi
 if test "$ac_cv_prog_CC" = "gcc"; then
-	if test "$with_debug" = yes; then
+	if test "$enable_debug" = "yes"; then
 		CFLAGS="${CFLAGS} -Wall"
 	else
 		CFLAGS="-O2 -Wall -fomit-frame-pointer"
 	fi
 fi
 if test "$on_qnx" = yes; then
-	if test "$with_debug" = yes; then
+	if test "$enable_debug" = "yes"; then
 		CFLAGS="-g"
 	else
 		CFLAGS="-Otax"
@@ -4478,24 +4475,20 @@ fi
 
 # Check whether --enable-force-utf8 was given.
 if test "${enable_force_utf8+set}" = set; then :
-  enableval=$enable_force_utf8; force_utf8=$enableval
-else
-  force_utf8=no
+  enableval=$enable_force_utf8;
 fi
 
-if test "$force_utf8" = yes; then
+if test "$enable_force_utf8" = "yes"; then
 	SYS_DEFS="$SYS_DEFS -DPDC_FORCE_UTF8"
 fi
 
 
 # Check whether --with-xaw3d was given.
 if test "${with_xaw3d+set}" = set; then :
-  withval=$with_xaw3d; with_xaw3d=$withval
-else
-  with_xaw3d=no
+  withval=$with_xaw3d;
 fi
 
-if test "$with_xaw3d" = yes; then
+if test "$with_xaw3d" = "yes"; then
 
 $as_echo "#define USE_XAW3D 1" >>confdefs.h
 
@@ -4504,12 +4497,10 @@ fi
 
 # Check whether --with-nextaw was given.
 if test "${with_nextaw+set}" = set; then :
-  withval=$with_nextaw; with_nextaw=$withval
-else
-  with_nextaw=no
+  withval=$with_nextaw;
 fi
 
-if test "$with_nextaw" = yes; then
+if test "$with_nextaw" = "yes"; then
 
 $as_echo "#define USE_NEXTAW 1" >>confdefs.h
 
@@ -4619,7 +4610,7 @@ if test "$DYN_COMP" = ""; then
 $as_echo_n "checking compiler flags for a dynamic object... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 4622 "configure"
+#line 4613 "configure"
 int a=0
 EOF
 
@@ -4658,7 +4649,7 @@ $as_echo "none of $mh_cv_flags supported" >&6; }
 
 mh_compile='${CC-cc} -c $DYN_COMP conftest.$ac_ext 1>&5'
 cat > conftest.$ac_ext <<EOF
-#line 4661 "configure"
+#line 4652 "configure"
 int foo()
 {
 return(0);
diff --git a/x11/configure.ac b/x11/configure.ac
index cc6eabd2..2019136a 100644
--- a/x11/configure.ac
+++ b/x11/configure.ac
@@ -74,13 +74,11 @@ MH_CHECK_X_TYPEDEF(XPointer)
 dnl ---------- allow --enable-debug to compile in debug mode ---------
 AC_ARG_ENABLE(debug,
 	[  --enable-debug          turn on debugging],
-	[with_debug=$enableval],
-	[with_debug=no],
 )
 cflags_g="`echo $CFLAGS | grep -c '\-g'`"
 cflags_O="`echo $CFLAGS | grep -c '\-O'`"
 
-if test "$with_debug" = yes; then
+if test "$enable_debug" = "yes"; then
 	if test "$cflags_g" = "0"; then
 		CFLAGS="${CFLAGS} -g"
 	fi
@@ -97,14 +95,14 @@ else
 	fi
 fi
 if test "$ac_cv_prog_CC" = "gcc"; then
-	if test "$with_debug" = yes; then
+	if test "$enable_debug" = "yes"; then
 		CFLAGS="${CFLAGS} -Wall"
 	else
 		CFLAGS="-O2 -Wall -fomit-frame-pointer"
 	fi
 fi
 if test "$on_qnx" = yes; then
-	if test "$with_debug" = yes; then
+	if test "$enable_debug" = "yes"; then
 		CFLAGS="-g"
 	else
 		CFLAGS="-Otax"
@@ -114,7 +112,7 @@ fi
 dnl --------------- check for wide character support -----------------
 dnl allow --enable-widec to include wide character support
 AC_ARG_ENABLE(widec,
-	[  --disable-widec         omit support for wide characters]
+	[  --disable-widec         omit support for wide characters],
 )
 PDC_WIDE=""
 if test "$enable_widec" != "no"; then
@@ -127,10 +125,8 @@ dnl ------------------------ force UTF-8? ----------------------------
 dnl allow --enable-force-utf8 to override locale settings
 AC_ARG_ENABLE(force-utf8,
 	[  --enable-force-utf8     override locale settings; use UTF-8],
-	[force_utf8=$enableval],
-	[force_utf8=no],
 )
-if test "$force_utf8" = yes; then
+if test "$enable_force_utf8" = "yes"; then
 	SYS_DEFS="$SYS_DEFS -DPDC_FORCE_UTF8"
 fi
 
@@ -138,10 +134,8 @@ dnl --------------------- check for Xaw3d library --------------------
 dnl allow --with-xaw3d to link with PDCurses
 AC_ARG_WITH(xaw3d,
 	[  --with-xaw3d            link with Xaw3d],
-	[with_xaw3d=$withval],
-	[with_xaw3d=no],
 )
-if test "$with_xaw3d" = yes; then
+if test "$with_xaw3d" = "yes"; then
 	AC_DEFINE([USE_XAW3D], [1],
 		[Define if you want to use Xaw3d library]
 	)
@@ -151,10 +145,8 @@ dnl --------------------- check for neXtaw library -------------------
 dnl allow --with-nextaw to link with PDCurses
 AC_ARG_WITH(nextaw,
 	[  --with-nextaw           link with neXtaw],
-	[with_nextaw=$withval],
-	[with_nextaw=no],
 )
-if test "$with_nextaw" = yes; then
+if test "$with_nextaw" = "yes"; then
 	AC_DEFINE([USE_NEXTAW], [1],
 		[Define if you want to use neXtaw library]
 	)