emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

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

Browse Source 
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
This commit is contained in:
Craig Small 2022-09-28 17:42:17 +10:00
parent 4b607edc12
commit f9f5f6ad38
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -219,13 +219,13 @@ AC_SUBST([HARDEN_LDFLAGS])
# Optional packages - AC_ARG_WITH # Optional packages - AC_ARG_WITH
AC_ARG_WITH([ncurses], AC_ARG_WITH([ncurses],
AS_HELP_STRING([--without-ncurses], [build only applications not needing 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] [with_ncurses=yes]
) )
if test "x$with_ncurses" = xno; then if test "x$with_ncurses" = xno; then
AM_CONDITIONAL(WITH_NCURSES, false) AM_CONDITIONAL(WITH_NCURSES, false)
AS_IF([test "x$enable_watch8bit" = "xyes"],
[AC_MSG_ERROR([Cannot have both --enable-watch8bit and --without-ncurses])])
else else
AM_CONDITIONAL(WITH_NCURSES, true) AM_CONDITIONAL(WITH_NCURSES, true)
PKG_CHECK_MODULES([NCURSES], [ncursesw], PKG_CHECK_MODULES([NCURSES], [ncursesw],