From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: /srv/bzr/emacs/trunk r101625: Set up GnuTLS support. Date: Sat, 02 Oct 2010 20:25:00 -0400 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1286065520 15222 80.91.229.12 (3 Oct 2010 00:25:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 3 Oct 2010 00:25:20 +0000 (UTC) Cc: emacs-devel@gnu.org To: Ted Zlatanov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Oct 03 02:25:17 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P2COC-0003SO-EF for ged-emacs-devel@m.gmane.org; Sun, 03 Oct 2010 02:25:16 +0200 Original-Received: from localhost ([127.0.0.1]:48305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P2COB-0002g4-PF for ged-emacs-devel@m.gmane.org; Sat, 02 Oct 2010 20:25:15 -0400 Original-Received: from [140.186.70.92] (port=58856 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P2CNz-0002fw-5G for emacs-devel@gnu.org; Sat, 02 Oct 2010 20:25:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P2CNx-0003wx-QU for emacs-devel@gnu.org; Sat, 02 Oct 2010 20:25:03 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:42810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P2CNx-0003wr-OX for emacs-devel@gnu.org; Sat, 02 Oct 2010 20:25:01 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1P2CNw-0008TB-Oz; Sat, 02 Oct 2010 20:25:00 -0400 X-Spook: World Trade Center anarchy Blowpipe strategic Attorney X-Ran: t0yMO]=-|V+rnX>OuBqBTx/i;W}P'icXwKj-m2,*>k-*EX-b-pz8$fGVQ"^p~-[2|a!aD4 X-Hue: black X-Attribution: GM In-Reply-To: (Ted Zlatanov's message of "Sun\, 26 Sep 2010 01\:06\:28 -0500") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:131267 Archived-At: Somebody may have mentioned this already, but was the following a by-hand change to src/config.in? That is not the right way to do it - that file is generated by autoheader from configure.in. The "#define LIBGNUTLS" stuff will get clobbered the next time someone regenerates config.in. But it seems pointless anyway? (Also this stuff needs a NEWS entry at some point.) > revno: 101625 > committer: Ted Zlatanov > branch nick: quickfixes > timestamp: Sun 2010-09-26 01:06:28 -0500 > message: > Set up GnuTLS support. [...] > === modified file 'src/config.in' > --- a/src/config.in 2010-09-10 16:44:35 +0000 > +++ b/src/config.in 2010-09-26 06:06:28 +0000 > @@ -255,6 +255,9 @@ > /* Define to 1 if you have a gif (or ungif) library. */ > #undef HAVE_GIF > > +/* Define if we have the GNU TLS library. */ > +#undef HAVE_GNUTLS > + > /* Define to 1 if you have the gpm library (-lgpm). */ > #undef HAVE_GPM > > @@ -1094,6 +1097,12 @@ > #include config_opsysfile > #include config_machfile > > +#if HAVE_GNUTLS > +#define LIBGNUTLS $(LIBGNUTLS_LIBS) > +#else /* not HAVE_GNUTLS */ > +#define LIBGNUTLS > +#endif /* not HAVE_GNUTLS */ > + > /* Set up some defines, C and LD flags for NeXTstep interface on GNUstep. > (There is probably a better place to do this, but right now the Cocoa > side does this in s/darwin.h and we cannot