From: Craig Small <csmall@dropbear.xyz>
Date: Wed, 28 Sep 2022 07:42:17 +0000 (+1000)
Subject: build-sys: Allow enable-watch9bit and with-ncurses
X-Git-Tag: v4.0.1rc2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9f5f6ad38ede32eba6c49ef4b8316d381686f3a;p=procps-ng

build-sys: Allow enable-watch9bit and with-ncurses

The commit that changed configure.ac was supposed to check for when
someone removes ncurses using the flag --without-ncurses

Unfortunately the change didn't check if the user was specifying
--without or --with meaning if they didn use --with-ncurses the
configure script would error out.

Signed-off-by: Craig Small <csmall@dropbear.xyz>

References:
  commit 812864181408398af98b217f384205a6f2f9cb68
  procps-ng/procps#251
---

diff --git a/configure.ac b/configure.ac
index 93670fca..629881a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,13 +219,13 @@ AC_SUBST([HARDEN_LDFLAGS])
 # Optional packages - AC_ARG_WITH
 AC_ARG_WITH([ncurses],
   AS_HELP_STRING([--without-ncurses], [build only applications not needing ncurses]),
-  [AS_IF([test "x$enable_watch8bit" = "xyes"],
-    [AC_MSG_ERROR([Cannot have both --enable-watch8bit and --without-ncurses])]
-  )],
+  [],
   [with_ncurses=yes]
 )
 if test "x$with_ncurses" = xno; then
   AM_CONDITIONAL(WITH_NCURSES, false)
+  AS_IF([test "x$enable_watch8bit" = "xyes"],
+    [AC_MSG_ERROR([Cannot have both --enable-watch8bit and --without-ncurses])])
 else
   AM_CONDITIONAL(WITH_NCURSES, true)
   PKG_CHECK_MODULES([NCURSES], [ncursesw],