From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH/RFC v3 2/8] Makefile & configure: add a NO_FNMATCH_CASEFOLD flag Date: Sun, 3 Oct 2010 09:56:40 +0000 Message-ID: <1286099806-25774-3-git-send-email-avarab@gmail.com> References: <4CA847D5.4000903@workspacewhiz.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , Joshua Jensen , Johannes Sixt , Brandon Casey , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Oct 03 11:58:11 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P2LKd-0005Kx-91 for gcvg-git-2@lo.gmane.org; Sun, 03 Oct 2010 11:58:11 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752381Ab0JCJ5X convert rfc822-to-quoted-printable (ORCPT ); Sun, 3 Oct 2010 05:57:23 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:44676 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752857Ab0JCJ5U (ORCPT ); Sun, 3 Oct 2010 05:57:20 -0400 Received: by wwj40 with SMTP id 40so2994753wwj.1 for ; Sun, 03 Oct 2010 02:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=jAsokTQYz3nmFh4e/oQ6OZfuRXq7wR9MFbxSSVDiWEA=; b=mZJJmeDYxHwyWDmJS7BqI7Q0BQ+95l0iUmLzsq2oOQVrfHfBKNQkZ1aI4zZvW/OOTd /7u7aGVEd3Mpg1ThsMdjAWzvs25B87SEOKdF1zqD+yUKljX0iz2fDExGwLd1wzjJBaCX Vh+uTaI+tz51INvoLwi/TjL9bvsrlzdgzP+dU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=FeoWE54jq4rj2MrHnqaedBWaj3ry4yC4Q5nQ6JuIy6CnC88If2o+UKNBDGjum2H9EN 8Oshv6EuKmoqMwv4PhBHNtD4dNzOZJuQrNvzr/xU/YRM3ccYWijLHX1V3NEAdiTyfBfP g87vVuC9DvFK+oh9YL8gr6YD8+H8+OUwgqwek= Received: by 10.227.145.14 with SMTP id b14mr7096965wbv.24.1286099838309; Sun, 03 Oct 2010 02:57:18 -0700 (PDT) Received: from v.nix.is (v.nix.is [109.74.193.250]) by mx.google.com with ESMTPS id h29sm2968435wbc.9.2010.10.03.02.57.16 (version=SSLv3 cipher=RC4-MD5); Sun, 03 Oct 2010 02:57:17 -0700 (PDT) X-Mailer: git-send-email 1.7.3.159.g610493 In-Reply-To: <4CA847D5.4000903@workspacewhiz.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On some platforms (like Solaris) there is a fnmatch, but it doesn't support the GNU FNM_CASEFOLD extension that's used by the jj/icase-directory series' fnmatch_icase wrapper. Change the Makefile so that it's now possible to set NO_FNMATCH_CASEFOLD=3DYesPlease on those systems, and add a configure probe for it. Unlike the NO_REGEX check we don't add AC_INCLUDES_DEFAULT to our headers. This is because on a GNU system the definition of =46NM_CASEFOLD in fnmatch.h is guarded by: #if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU= _SOURCE One of the headers AC_INCLUDES_DEFAULT includes ends up defining one of those, so if we'd use it we'd always get NO_FNMATCH_CASEFOLD=3DYesPlease on GNU systems, even though they have =46NM_CASEFOLD. Signed-off-by: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason --- Makefile | 9 +++++++++ config.mak.in | 1 + configure.ac | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index f7c4383..5fe0523 100644 --- a/Makefile +++ b/Makefile @@ -72,6 +72,9 @@ all:: # # Define NO_FNMATCH if you don't have fnmatch in the C library. # +# Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the +# FNM_CASEFOLD GNU extension. +# # Define NO_LIBGEN_H if you don't have libgen.h. # # Define NEEDS_LIBGEN if your libgen needs -lgen when linking @@ -848,6 +851,7 @@ ifeq ($(uname_S),SunOS) NO_MKDTEMP =3D YesPlease NO_MKSTEMPS =3D YesPlease NO_REGEX =3D YesPlease + NO_FNMATCH_CASEFOLD =3D YesPlease ifeq ($(uname_R),5.6) SOCKLEN_T =3D int NO_HSTRERROR =3D YesPlease @@ -1350,6 +1354,11 @@ ifdef NO_FNMATCH COMPAT_CFLAGS +=3D -DNO_FNMATCH COMPAT_OBJS +=3D compat/fnmatch/fnmatch.o endif +ifdef NO_FNMATCH_CASEFOLD + COMPAT_CFLAGS +=3D -Icompat/fnmatch + COMPAT_CFLAGS +=3D -DNO_FNMATCH_CASEFOLD + COMPAT_OBJS +=3D compat/fnmatch/fnmatch.o +endif ifdef NO_SETENV COMPAT_CFLAGS +=3D -DNO_SETENV COMPAT_OBJS +=3D compat/setenv.o diff --git a/config.mak.in b/config.mak.in index aaa70a8..56343ba 100644 --- a/config.mak.in +++ b/config.mak.in @@ -48,6 +48,7 @@ NO_HSTRERROR=3D@NO_HSTRERROR@ NO_STRCASESTR=3D@NO_STRCASESTR@ NO_STRTOK_R=3D@NO_STRTOK_R@ NO_FNMATCH=3D@NO_FNMATCH@ +NO_FNMATCH_CASEFOLD=3D@NO_FNMATCH_CASEFOLD@ NO_MEMMEM=3D@NO_MEMMEM@ NO_STRLCPY=3D@NO_STRLCPY@ NO_UINTMAX_T=3D@NO_UINTMAX_T@ diff --git a/configure.ac b/configure.ac index 7715f6c..6dd9241 100644 --- a/configure.ac +++ b/configure.ac @@ -824,6 +824,28 @@ GIT_CHECK_FUNC(fnmatch, [NO_FNMATCH=3DYesPlease]) AC_SUBST(NO_FNMATCH) # +# Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the +# FNM_CASEFOLD GNU extension. +AC_CACHE_CHECK([whether the fnmatch function supports the FNMATCH_CASE= =46OLD GNU extension], + [ac_cv_c_excellent_fnmatch], [ +AC_EGREP_CPP(yippeeyeswehaveit, + AC_LANG_PROGRAM([ +#include +], +[#ifdef FNM_CASEFOLD +yippeeyeswehaveit +#endif +]), + [ac_cv_c_excellent_fnmatch=3Dyes], + [ac_cv_c_excellent_fnmatch=3Dno]) +]) +if test $ac_cv_c_excellent_fnmatch =3D yes; then + NO_FNMATCH_CASEFOLD=3D +else + NO_FNMATCH_CASEFOLD=3DYesPlease +fi +AC_SUBST(NO_FNMATCH_CASEFOLD) +# # Define NO_MEMMEM if you don't have memmem. GIT_CHECK_FUNC(memmem, [NO_MEMMEM=3D], --=20 1.7.3.159.g610493