From owner-freebsd-current@FreeBSD.ORG  Tue Sep  2 13:26:03 2008
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 667D2106566B;
	Tue,  2 Sep 2008 13:26:03 +0000 (UTC)
	(envelope-from bkelly@vadev.org)
Received: from ianto.vadev.org (vadev.org [66.92.166.151])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C94D8FC18;
	Tue,  2 Sep 2008 13:26:02 +0000 (UTC)
	(envelope-from bkelly@vadev.org)
Received: from harkness.vadev.org (harkness.vadev.org [192.168.1.210])
	(authenticated bits=0)
	by ianto.vadev.org (8.14.3/8.14.3) with ESMTP id m82CkZNf012550
	(version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO);
	Tue, 2 Sep 2008 12:46:36 GMT (envelope-from bkelly@vadev.org)
Message-Id: <21FF036D-2418-43E4-8FA6-84DCF71BDFDE@vadev.org>
From: Ben Kelly <bkelly@vadev.org>
To: current@freebsd.org
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Apple Message framework v926)
Date: Tue, 2 Sep 2008 08:46:35 -0400
X-Mailer: Apple Mail (2.926)
X-Spam-Score: -1.44 () ALL_TRUSTED
X-Scanned-By: MIMEDefang 2.64 on 192.168.1.110
Cc: roberto@freebsd.org
Subject: [patch] ntp no longer compiles using WITHOUT_GNU_SUPPORT
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Sep 2008 13:26:03 -0000

Hello all,

It looks like the following commit broke the WITHOUT_GNU_SUPPORT knob  
when compiling ntp:

   http://svn.freebsd.org/viewvc/base?view=revision&revision=182008

The various readline symbols are conditionally set in usr.sbin/ntp/ 
ntpdc/Makefile, but this commit now hardcodes them in the usr.sbin/ntp/ 
config.h as well.  I assume this was not intended.

The attached patch fixed the issue for me.

Anyway, just FYI.  Thanks.

- Ben

Index: usr.sbin/ntp/config.h
===================================================================
--- usr.sbin/ntp/config.h	(revision 91)
+++ usr.sbin/ntp/config.h	(working copy)
@@ -439,7 +439,7 @@
  /* #undef HAVE_LIBPOSIX4 */

  /* Define to 1 if you have the `readline' library (-lreadline). */
-#define HAVE_LIBREADLINE 1
+/* #undef HAVE_LIBREADLINE */

  /* Define to 1 if you have the `rt' library (-lrt). */
  #define HAVE_LIBRT 1
@@ -570,10 +570,10 @@
  /* #undef HAVE_PUTUTXLINE */

  /* Define to 1 if you have the <readline/history.h> header file. */
-#define HAVE_READLINE_HISTORY_H 1
+/* #undef HAVE_READLINE_HISTORY_H */

  /* Define to 1 if you have the <readline/readline.h> header file. */
-#define HAVE_READLINE_READLINE_H 1
+/* #undef HAVE_READLINE_READLINE_H */

  /* Define to 1 if you have the `readlink' function. */
  #define HAVE_READLINK 1