From nobody Tue Jan 04 22:26:41 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E1AC419222FA for ; Tue, 4 Jan 2022 22:26:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ua1-x931.google.com (mail-ua1-x931.google.com [IPv6:2607:f8b0:4864:20::931]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JT6fh5ntXz4nJ5 for ; Tue, 4 Jan 2022 22:26:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ua1-x931.google.com with SMTP id az37so44892427uab.12 for ; Tue, 04 Jan 2022 14:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=F4+ajmNJtS2AZCC+GIWB4l26SUpCD1qw8loTt48YrRs=; b=DBpiTLOQ8RNb7b2psep0P+J6sABYspwp/dgE/8S4EMYUnKHETvueEL5XL6duessCh/ 0smSp2fxaVHTLh46sVCiTU4FTJjmGlLSyMYKqF48tycvbDnLrSQMxwlhU5ssYmqVJffK nwecKVzR4QNlfnnhiKrwbBc0sUD4GbYlIfuBhq5VECb6lwdgNVPMzoTIkX+Yn9XxlNQY dbceeAFu0CwKqqdTl1UVha9uYLlDnxLNVzQ1WmRlw7LZWEoMO+8V3eLmiUD45Hl7IUjX Vx/D/JBnbNE6gGVKLnfHueQ1ESmaF0wQmXe0r5lulFKHDj7wo3StZreBXTYtYcOqhfvl kCig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=F4+ajmNJtS2AZCC+GIWB4l26SUpCD1qw8loTt48YrRs=; b=XJ7TyEoVhrVuRN7NWK5kDhl9AOgol9o5iYQsnn+GFWp/CgKqqQVHq8Rc0wESktpwAS 02qSarwf515wvwsHToupGPx6YRX6mJcfEQTyhIy39qNkR1J1+TnmugjTqcHBF9ZdD3Cz Q1NEW+jaFsRynRC7ILJWUAMu3DL/xY8dx7kCBaUVZ8mCFGqYolU39KfD04ka1Vf9hhK4 zLHJKB4+DoPlpF5mTLKWafZ7vLAI53S8J2B01RVS3hn7JHJTFUxLlfnMqwps3rFcmp2n JpMcErp8zVR1uunJd4S/QFzd65hmqHrHyQZc4ave6IzPBkNtonGdPv0RDEC88vCDQArd bakA== X-Gm-Message-State: AOAM532YUAywSaoM0eaIvGlUgRHtPXR8V9UA4KveYwCQBuY/RxYA6D4N SgY29+hqkagBUcVMyldj9eb85WsHjHcSPJ4A8RZv7+pu26o= X-Google-Smtp-Source: ABdhPJzXAQw4VVy7U522BSg/Abg7fzWNlv9ObrwefhOYJtqZLjizCUxmmQ/Lyq6guGgbeSG+34Dy81hB6HPdVL2wFKQ= X-Received: by 2002:a67:f8cb:: with SMTP id c11mr16123165vsp.13.1641335212049; Tue, 04 Jan 2022 14:26:52 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202201030209.20329qRc018384@gitrepo.freebsd.org> <77ae0cc3-ed4e-5233-f7ae-ea4fe3de1606@FreeBSD.org> In-Reply-To: <77ae0cc3-ed4e-5233-f7ae-ea4fe3de1606@FreeBSD.org> From: Warner Losh Date: Tue, 4 Jan 2022 15:26:41 -0700 Message-ID: Subject: Re: git: 902665210189 - main - libmagic: Remove support for older FreeBSD where xlocale was not available. To: Xin Li Cc: Jessica Clarke , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000459c6005d4c922dd" X-Rspamd-Queue-Id: 4JT6fh5ntXz4nJ5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --000000000000459c6005d4c922dd Content-Type: text/plain; charset="UTF-8" On Tue, Jan 4, 2022 at 11:21 AM Xin Li wrote: > On 1/4/22 09:18, Warner Losh wrote: > > This breaks the cross building on linux. The FREEBSD_XLOCALE_SUPPORT > > was covering both the case of old FreeBSD as well as the case of > > building on Linux/macOS. when we cross build, we define > > __FreeBSD_version to be 0. > > > > All that really needs protecting is the xlocale.h include though. And > > that's only needed on Linux / glibc, so the following patch should do > > the trick: > > > > /* Define to 1 if you have the header file. */ > > +#ifndef linux /* Cross building tools build with glibc on linux */ > > #define HAVE_XLOCALE_H 1 > > +#endif > > > > Any objections to committing that? Or should I create a phab review to > > discuss? > > Ah I didn't know that. Yes that looks reasonable (I assume you would > also restore the #ifdef's for HAVE_XLOCAL_H). > They are already there, so I didn't need to make any other changes. Warner > Cheers, > > > Warner > > > > > > On Sun, Jan 2, 2022 at 7:09 PM Xin LI > > wrote: > > > > The branch main has been updated by delphij: > > > > URL: > > > https://cgit.FreeBSD.org/src/commit/?id=90266521018938b7b9f0003ba9a383b6920859e9 > > < > https://cgit.FreeBSD.org/src/commit/?id=90266521018938b7b9f0003ba9a383b6920859e9 > > > > > > commit 90266521018938b7b9f0003ba9a383b6920859e9 > > Author: Xin LI > > AuthorDate: 2022-01-03 02:05:08 +0000 > > Commit: Xin LI > > CommitDate: 2022-01-03 02:05:08 +0000 > > > > libmagic: Remove support for older FreeBSD where xlocale was > > not available. > > > > The MINIMUM_SUPPORTED_OSREL is 1002501 (FreeBSD 10.3), and > > xlocale is > > supported there. > > > > While I'm there, explicitly use config.h generated with > > --disable-bzlib > > --disable-xzlib instead of deleting them manually. > > > > MFC after: 2 weeks > > --- > > lib/libmagic/config.h | 36 ++++++++++++++++++------------------ > > 1 file changed, 18 insertions(+), 18 deletions(-) > > > > diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h > > index 263fdfb571cd..90a9a115420c 100644 > > --- a/lib/libmagic/config.h > > +++ b/lib/libmagic/config.h > > @@ -1,13 +1,3 @@ > > -/* $FreeBSD$ */ > > - > > -/* Get __FreeBSD_version. */ > > -#include > > - > > -/* Only specific versions of FreeBSD support xlocale */ > > -#if __FreeBSD_version >= 1000002 || (__FreeBSD_version < 1000000 && > > __FreeBSD_version >= 900506) > > -#define FREEBSD_XLOCALE_SUPPORT 1 > > -#endif > > - > > /* config.h. Generated from config.h.in by > > configure. */ > > /* config.h.in . Generated from configure.ac > > by autoheader. */ > > > > @@ -17,6 +7,9 @@ > > /* Define in built-in ELF support is used */ > > #define BUILTIN_ELF 1 > > > > +/* Enable bzlib compression support */ > > +/* #undef BZLIBSUPPORT */ > > + > > /* Define for ELF core file support */ > > #define ELFCORE 1 > > > > @@ -26,6 +19,9 @@ > > /* Define to 1 if you have the `asprintf' function. */ > > #define HAVE_ASPRINTF 1 > > > > +/* Define to 1 if you have the header file. */ > > +/* #undef HAVE_BZLIB_H */ > > + > > /* Define to 1 if you have the `ctime_r' function. */ > > #define HAVE_CTIME_R 1 > > > > @@ -59,9 +55,7 @@ > > #define HAVE_FORK 1 > > > > /* Define to 1 if you have the `freelocale' function. */ > > -#ifdef FREEBSD_XLOCALE_SUPPORT > > #define HAVE_FREELOCALE 1 > > -#endif > > > > /* Define to 1 if fseeko (and presumably ftello) exists and is > > declared. */ > > #define HAVE_FSEEKO 1 > > @@ -87,9 +81,15 @@ > > /* Define to 1 if you have the header file. */ > > #define HAVE_INTTYPES_H 1 > > > > +/* Define to 1 if you have the `bz2' library (-lbz2). */ > > +/* #undef HAVE_LIBBZ2 */ > > + > > /* Define to 1 if you have the `gnurx' library (-lgnurx). */ > > /* #undef HAVE_LIBGNURX */ > > > > +/* Define to 1 if you have the `lzma' library (-llzma). */ > > +/* #undef HAVE_LIBLZMA */ > > + > > /* Define to 1 if you have the `seccomp' library (-lseccomp). */ > > /* #undef HAVE_LIBSECCOMP */ > > > > @@ -99,6 +99,9 @@ > > /* Define to 1 if you have the `localtime_r' function. */ > > #define HAVE_LOCALTIME_R 1 > > > > +/* Define to 1 if you have the header file. */ > > +/* #undef HAVE_LZMA_H */ > > + > > /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ > > #define HAVE_MBRTOWC 1 > > > > @@ -121,9 +124,7 @@ > > #define HAVE_MMAP 1 > > > > /* Define to 1 if you have the `newlocale' function. */ > > -#ifdef FREEBSD_XLOCALE_SUPPORT > > #define HAVE_NEWLOCALE 1 > > -#endif > > > > /* Define to 1 if you have the `pread' function. */ > > #define HAVE_PREAD 1 > > @@ -210,9 +211,7 @@ > > #define HAVE_UNISTD_H 1 > > > > /* Define to 1 if you have the `uselocale' function. */ > > -#ifdef FREEBSD_XLOCALE_SUPPORT > > #define HAVE_USELOCALE 1 > > -#endif > > > > /* Define to 1 if you have the `utime' function. */ > > #define HAVE_UTIME 1 > > @@ -252,9 +251,7 @@ > > #define HAVE_WORKING_VFORK 1 > > > > /* Define to 1 if you have the header file. */ > > -#ifdef FREEBSD_XLOCALE_SUPPORT > > #define HAVE_XLOCALE_H 1 > > -#endif > > > > /* Define to 1 if you have the header file. */ > > #define HAVE_ZLIB_H 1 > > @@ -334,6 +331,9 @@ > > # endif > > #endif > > > > +/* Enable xzlib compression support */ > > +/* #undef XZLIBSUPPORT */ > > + > > /* Enable zlib compression support */ > > #define ZLIBSUPPORT 1 > > > > --000000000000459c6005d4c922dd Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Jan 4, 2022 at 11:21 AM Xin L= i <delphij@freebsd.org> wr= ote:
On 1/4/22 0= 9:18, Warner Losh wrote:
> This breaks the cross building on linux.=C2=A0 The FREEBSD_XLOCALE_SUP= PORT
> was covering both the case of old FreeBSD as well as the case of
> building on Linux/macOS. when we cross build, we define
> __FreeBSD_version to be 0.
>
> All that really needs protecting is the xlocale.h include though. And =
> that's only needed on Linux / glibc, so the following patch should= do
> the trick:
>
>=C2=A0 =C2=A0/* Define to 1 if you have the <xlocale.h> header fi= le. */
> +#ifndef linux /* Cross building tools build with glibc on linux */ >=C2=A0 =C2=A0#define HAVE_XLOCALE_H 1
> +#endif
>
> Any objections to committing that? Or should I create a phab review to=
> discuss?

Ah I didn't know that.=C2=A0 Yes that looks reasonable (I assume you wo= uld
also restore the #ifdef's for HAVE_XLOCAL_H).

=
They are already there, so I didn't need to make any other c= hanges.

Warner
=C2=A0
Cheers,

> Warner
>
>
> On Sun, Jan 2, 2022 at 7:09 PM Xin LI <delphij@freebsd.org
> <mailto:de= lphij@freebsd.org>> wrote:
>
>=C2=A0 =C2=A0 =C2=A0The branch main has been updated by delphij:
>
>=C2=A0 =C2=A0 =C2=A0URL:
>=C2=A0 =C2=A0 =C2=A0https://cgit.FreeBSD.org/src/commit/?id=3D90266521018938b7b9f0003ba9= a383b6920859e9
>=C2=A0 =C2=A0 =C2=A0<https://cgit.FreeBSD.org/src/commit/?id=3D90266521018938b7b9f00= 03ba9a383b6920859e9>
>
>=C2=A0 =C2=A0 =C2=A0commit 90266521018938b7b9f0003ba9a383b6920859e9
>=C2=A0 =C2=A0 =C2=A0Author:=C2=A0 =C2=A0 =C2=A0Xin LI <delphij@FreeB= SD.org>
>=C2=A0 =C2=A0 =C2=A0AuthorDate: 2022-01-03 02:05:08 +0000
>=C2=A0 =C2=A0 =C2=A0Commit:=C2=A0 =C2=A0 =C2=A0Xin LI <delphij@FreeB= SD.org>
>=C2=A0 =C2=A0 =C2=A0CommitDate: 2022-01-03 02:05:08 +0000
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 libmagic: Remove support for older F= reeBSD where xlocale was
>=C2=A0 =C2=A0 =C2=A0not available.
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 The MINIMUM_SUPPORTED_OSREL is 10025= 01 (FreeBSD 10.3), and
>=C2=A0 =C2=A0 =C2=A0xlocale is
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 supported there.
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 While I'm there, explicitly use = config.h generated with
>=C2=A0 =C2=A0 =C2=A0--disable-bzlib
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --disable-xzlib instead of deleting = them manually.
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 2 wee= ks
>=C2=A0 =C2=A0 =C2=A0---
>=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libmagic/config.h | 36 +++++++++++++++++= +------------------
>=C2=A0 =C2=A0 =C2=A0 =C2=A01 file changed, 18 insertions(+), 18 deletio= ns(-)
>
>=C2=A0 =C2=A0 =C2=A0diff --git a/lib/libmagic/config.h b/lib/libmagic/c= onfig.h
>=C2=A0 =C2=A0 =C2=A0index 263fdfb571cd..90a9a115420c 100644
>=C2=A0 =C2=A0 =C2=A0--- a/lib/libmagic/config.h
>=C2=A0 =C2=A0 =C2=A0+++ b/lib/libmagic/config.h
>=C2=A0 =C2=A0 =C2=A0@@ -1,13 +1,3 @@
>=C2=A0 =C2=A0 =C2=A0-/* $FreeBSD$ */
>=C2=A0 =C2=A0 =C2=A0-
>=C2=A0 =C2=A0 =C2=A0-/* Get __FreeBSD_version. */
>=C2=A0 =C2=A0 =C2=A0-#include <osreldate.h>
>=C2=A0 =C2=A0 =C2=A0-
>=C2=A0 =C2=A0 =C2=A0-/* Only specific versions of FreeBSD support xloca= le */
>=C2=A0 =C2=A0 =C2=A0-#if __FreeBSD_version >=3D 1000002 || (__FreeBS= D_version < 1000000 &&
>=C2=A0 =C2=A0 =C2=A0__FreeBSD_version >=3D 900506)
>=C2=A0 =C2=A0 =C2=A0-#define FREEBSD_XLOCALE_SUPPORT 1
>=C2=A0 =C2=A0 =C2=A0-#endif
>=C2=A0 =C2=A0 =C2=A0-
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* config.h.=C2=A0 Generated from config.h.in &= lt;http= ://config.h.in> by
>=C2=A0 =C2=A0 =C2=A0configure.=C2=A0 */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* config.h.in <http://config.h.in>.=C2=A0 G= enerated from configure.ac
>=C2=A0 =C2=A0 =C2=A0<http://configure.ac> by autoheader.=C2=A0 */ >
>=C2=A0 =C2=A0 =C2=A0@@ -17,6 +7,9 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define in built-in ELF support is used */=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define BUILTIN_ELF 1
>
>=C2=A0 =C2=A0 =C2=A0+/* Enable bzlib compression support */
>=C2=A0 =C2=A0 =C2=A0+/* #undef BZLIBSUPPORT */
>=C2=A0 =C2=A0 =C2=A0+
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define for ELF core file support */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define ELFCORE 1
>
>=C2=A0 =C2=A0 =C2=A0@@ -26,6 +19,9 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `asprintf'= ; function. */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_ASPRINTF 1
>
>=C2=A0 =C2=A0 =C2=A0+/* Define to 1 if you have the <bzlib.h> hea= der file. */
>=C2=A0 =C2=A0 =C2=A0+/* #undef HAVE_BZLIB_H */
>=C2=A0 =C2=A0 =C2=A0+
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `ctime_r'= function. */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_CTIME_R 1
>
>=C2=A0 =C2=A0 =C2=A0@@ -59,9 +55,7 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_FORK 1
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `freelocale&#= 39; function. */
>=C2=A0 =C2=A0 =C2=A0-#ifdef FREEBSD_XLOCALE_SUPPORT
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_FREELOCALE 1
>=C2=A0 =C2=A0 =C2=A0-#endif
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if fseeko (and presumably fte= llo) exists and is
>=C2=A0 =C2=A0 =C2=A0declared. */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_FSEEKO 1
>=C2=A0 =C2=A0 =C2=A0@@ -87,9 +81,15 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the <inttypes.= h> header file. */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_INTTYPES_H 1
>
>=C2=A0 =C2=A0 =C2=A0+/* Define to 1 if you have the `bz2' library (= -lbz2). */
>=C2=A0 =C2=A0 =C2=A0+/* #undef HAVE_LIBBZ2 */
>=C2=A0 =C2=A0 =C2=A0+
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `gnurx' l= ibrary (-lgnurx). */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* #undef HAVE_LIBGNURX */
>
>=C2=A0 =C2=A0 =C2=A0+/* Define to 1 if you have the `lzma' library = (-llzma). */
>=C2=A0 =C2=A0 =C2=A0+/* #undef HAVE_LIBLZMA */
>=C2=A0 =C2=A0 =C2=A0+
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `seccomp'= library (-lseccomp). */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* #undef HAVE_LIBSECCOMP */
>
>=C2=A0 =C2=A0 =C2=A0@@ -99,6 +99,9 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `localtime_r&= #39; function. */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_LOCALTIME_R 1
>
>=C2=A0 =C2=A0 =C2=A0+/* Define to 1 if you have the <lzma.h> head= er file. */
>=C2=A0 =C2=A0 =C2=A0+/* #undef HAVE_LZMA_H */
>=C2=A0 =C2=A0 =C2=A0+
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if mbrtowc and mbstate_t are = properly declared. */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_MBRTOWC 1
>
>=C2=A0 =C2=A0 =C2=A0@@ -121,9 +124,7 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_MMAP 1
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `newlocale= 9; function. */
>=C2=A0 =C2=A0 =C2=A0-#ifdef FREEBSD_XLOCALE_SUPPORT
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_NEWLOCALE 1
>=C2=A0 =C2=A0 =C2=A0-#endif
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `pread' f= unction. */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_PREAD 1
>=C2=A0 =C2=A0 =C2=A0@@ -210,9 +211,7 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_UNISTD_H 1
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `uselocale= 9; function. */
>=C2=A0 =C2=A0 =C2=A0-#ifdef FREEBSD_XLOCALE_SUPPORT
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_USELOCALE 1
>=C2=A0 =C2=A0 =C2=A0-#endif
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the `utime' f= unction. */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_UTIME 1
>=C2=A0 =C2=A0 =C2=A0@@ -252,9 +251,7 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_WORKING_VFORK 1
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the <xlocale.h= > header file. */
>=C2=A0 =C2=A0 =C2=A0-#ifdef FREEBSD_XLOCALE_SUPPORT
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_XLOCALE_H 1
>=C2=A0 =C2=A0 =C2=A0-#endif
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Define to 1 if you have the <zlib.h>= ; header file. */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define HAVE_ZLIB_H 1
>=C2=A0 =C2=A0 =C2=A0@@ -334,6 +331,9 @@
>=C2=A0 =C2=A0 =C2=A0 =C2=A0# endif
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#endif
>
>=C2=A0 =C2=A0 =C2=A0+/* Enable xzlib compression support */
>=C2=A0 =C2=A0 =C2=A0+/* #undef XZLIBSUPPORT */
>=C2=A0 =C2=A0 =C2=A0+
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Enable zlib compression support */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0#define ZLIBSUPPORT 1
>

--000000000000459c6005d4c922dd--