Re: [PATCH 1/2] configure: add a fallback check for zlib
authorFraser Tweedale <frase@frase.id.au>
Wed, 21 May 2014 09:13:05 +0000 (19:13 +1000)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:02:54 +0000 (10:02 -0800)
9f/7f2fba7cd25843b66202eaf9b92bad4581dcd6 [new file with mode: 0644]

diff --git a/9f/7f2fba7cd25843b66202eaf9b92bad4581dcd6 b/9f/7f2fba7cd25843b66202eaf9b92bad4581dcd6
new file mode 100644 (file)
index 0000000..de4cd1d
--- /dev/null
@@ -0,0 +1,146 @@
+Return-Path: <frase@frase.id.au>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 127AC431FC7\r
+       for <notmuch@notmuchmail.org>; Wed, 21 May 2014 02:45:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 3HLgFA9-TaIv for <notmuch@notmuchmail.org>;\r
+       Wed, 21 May 2014 02:45:23 -0700 (PDT)\r
+Received: from captainmorgan.hollandpark.frase.id.au\r
+       (110-174-235-130.static.tpgi.com.au [110.174.235.130])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 938FD431FC4\r
+       for <notmuch@notmuchmail.org>; Wed, 21 May 2014 02:45:22 -0700 (PDT)\r
+Received: from bacardi.hollandpark.frase.id.au\r
+       (bacardi.hollandpark.frase.id.au [192.168.0.100])\r
+       by captainmorgan.hollandpark.frase.id.au (8.14.5/8.14.5) with ESMTP id\r
+       s4L9D61N023263\r
+       for <notmuch@notmuchmail.org>; Wed, 21 May 2014 19:13:06 +1000 (EST)\r
+       (envelope-from frase@frase.id.au)\r
+Received: from bacardi.hollandpark.frase.id.au (localhost [127.0.0.1])\r
+       by bacardi.hollandpark.frase.id.au (8.14.7/8.14.7) with ESMTP id\r
+       s4L9D6JU073986\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256\r
+       verify=NO)\r
+       for <notmuch@notmuchmail.org>; Wed, 21 May 2014 19:13:06 +1000 (EST)\r
+       (envelope-from frase@frase.id.au)\r
+Received: (from fraser@localhost)\r
+       by bacardi.hollandpark.frase.id.au (8.14.7/8.14.7/Submit) id\r
+       s4L9D5HY073985\r
+       for notmuch@notmuchmail.org; Wed, 21 May 2014 19:13:05 +1000 (EST)\r
+       (envelope-from frase@frase.id.au)\r
+X-Authentication-Warning: bacardi.hollandpark.frase.id.au: fraser set sender\r
+       to frase@frase.id.au using -f\r
+Date: Wed, 21 May 2014 19:13:05 +1000\r
+From: Fraser Tweedale <frase@frase.id.au>\r
+To: notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] configure: add a fallback check for zlib\r
+Message-ID: <20140521091304.GT62147@bacardi.hollandpark.frase.id.au>\r
+References: <1399753646-3026-1-git-send-email-xico@atelo.org>\r
+       <536e965c9415e_300d7772fc9@nysa.notmuch>\r
+       <m261ldi98h.fsf@guru.guru-group.fi>\r
+       <536ea7d6a4c86_3c5a8eb3048b@nysa.notmuch>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha1;\r
+       protocol="application/pgp-signature"; boundary="LZFKeWUZP29EKQNE"\r
+Content-Disposition: inline\r
+In-Reply-To: <536ea7d6a4c86_3c5a8eb3048b@nysa.notmuch>\r
+User-Agent: Mutt/1.5.23 (2014-03-12)\r
+X-Mailman-Approved-At: Wed, 21 May 2014 12:30:39 -0700\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 21 May 2014 09:45:27 -0000\r
+\r
+\r
+--LZFKeWUZP29EKQNE\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Sat, May 10, 2014 at 05:27:34PM -0500, Felipe Contreras wrote:\r
+> Tomi Ollila wrote:\r
+> > On Sun, May 11 2014, Felipe Contreras <felipe.contreras@gmail.com> wrot=\r
+e:\r
+> >=20\r
+> > > X=C4=ABc=C3=B2 wrote:\r
+> > >> Since zlib is part of the base system, FreeBSD chose not to register=\r
+ it\r
+> > >> in pkg-config through zlib.pc. As a fallback test, configure will bu=\r
+ild\r
+> > >> and run a zlib version check and make sure the header and library\r
+> > >> versions are compatible.\r
+> > >\r
+> > > We could try to generate our on zlib.pc, this way the configure script\r
+> > > would be cleaner.\r
+> >=20\r
+> > But for that we'd need to figure out the version, and is there simpler\r
+> > robust way to do that some other way ?\r
+>=20\r
+> I don't meant to change the code that is checking for the version in the\r
+> patch, you use the same code, but instead of have_zlib.c gen_zlib_pc.c,\r
+> or something.\r
+>=20\r
+\r
+[please cc me in replies; I am not subscribed to the list]\r
+\r
+I think that the additional complexity outweighs the benefit of a\r
+somewhat cleaner build script.\r
+\r
+If the $vz1, $vz2, et al. are what's bothering you, perhaps we could\r
+push the complexity of version comparison into have_zlib.c and\r
+supply the (string) version number as an argument to the program.\r
+The have_zlib program could do the comparison and exit accordingly,\r
+and plain old "1.2.5.2" can take its place in the configure script\r
+once more.\r
+\r
+However, I don't see any problems with the patch as it is; I have\r
+tested it on FreeBSD 10.0 and it works.\r
+\r
+Regards,\r
+\r
+Fraser\r
+\r
+> --=20\r
+> Felipe Contreras\r
+\r
+--LZFKeWUZP29EKQNE\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v2.0.22 (FreeBSD)\r
+\r
+iQIcBAEBAgAGBQJTfG4gAAoJEEtTkFJBEeHicyAP/Ar2jAL/Gh6QI4J99sO9uGfJ\r
+Xuxd9OQ2CKPLk0YaOl6lek2pqa9YHGZ86CyRT00JGIdrqHykPEawRbF1hpXLSzQb\r
+aDbLYEnFKCBSk4kfdQX//5BM9ovSIe3krTwyJAKNysfL7iGLLDr6u8V00ExuHTVG\r
+nCagnTaADOth3tl13mP7fYN9Q4Ye9TniVDMOBhSKFzMqzAohHK9dHerFXZGM76yx\r
+hnJqM3Zao9XBo5Ow1Wu1k3snEKb+jCcMPg1zUncmIoYecxqJKIj9X0DMZ+Odwmw/\r
+250bbxu1OS/N6ffaitFnCWVvQLFJER8QvG6iErw3V0xpX9zmdF4H8Ans43T+eldT\r
+WsWGtrIfoqkQuBCYlrNTog9rF8DBnB3vx5VsYaBW0vsoHH1faDz7BHy7w5dRVQuF\r
+GxYPWV2HM38rbbZht42AsM8tI/uDp3nsWs7gd9N9+29pwFcy3kboSl0Wiff749BD\r
+gwkM1D1QJmYpNqolMw0opu4kUeF4t2UJlhO7YQMReNIRNjjeqFjhAWmtWKGDMnwQ\r
+ji4QOfCIzwMtc2LBvEpmEHKUtbfxrixruqVmLS8j2l2pRa8opgp955YQ1VYrVS0v\r
+EIVFKQa3wl4wgiy+cRdOG2bfl74HgxxkYxhC9IJzq1Fbxgs2Zhydll4iSpThBJCu\r
+5dpIBwpgZlzvisG0HObV\r
+=41bM\r
+-----END PGP SIGNATURE-----\r
+\r
+--LZFKeWUZP29EKQNE--\r