Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Jul 2019 14:23:51 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r349997 - head/usr.sbin/ngctl
Message-ID:  <201907151423.x6FENpK1002864@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Mon Jul 15 14:23:51 2019
New Revision: 349997
URL: https://svnweb.freebsd.org/changeset/base/349997

Log:
  Replace complicated expression to disable libedit when no libthr is being built
  with a simpler one.

Modified:
  head/usr.sbin/ngctl/Makefile

Modified: head/usr.sbin/ngctl/Makefile
==============================================================================
--- head/usr.sbin/ngctl/Makefile	Mon Jul 15 14:19:39 2019	(r349996)
+++ head/usr.sbin/ngctl/Makefile	Mon Jul 15 14:23:51 2019	(r349997)
@@ -9,17 +9,9 @@ SRCS=	main.c mkpeer.c config.c connect.c dot.c name.c 
 	msg.c debug.c shutdown.c rmhook.c status.c types.c write.c
 WARNS?=	3
 
-.if defined(RELEASE_CRUNCH)
-NGCTL_NO_LIBEDIT=
-.endif
-
-.if ${MK_LIBTHR} == "no"
-NGCTL_NO_LIBEDIT=
-.endif
-
 LIBADD=	netgraph
 
-.if !defined(NGCTL_NO_LIBEDIT)
+.if ${MK_LIBTHR} != "no"
 CFLAGS+= -DEDITLINE
 LIBADD+=	edit pthread
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907151423.x6FENpK1002864>