--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\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 114D9431FC4\r
+ for <notmuch@notmuchmail.org>; Sun, 24 Nov 2013 09:08:53 -0800 (PST)\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 okPGHipKcDBi for <notmuch@notmuchmail.org>;\r
+ Sun, 24 Nov 2013 09:08:45 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 1169C431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 24 Nov 2013 09:08:45 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 861D410005E;\r
+ Sun, 24 Nov 2013 19:08:40 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] new: Detect dirent.d_type support at configure time\r
+In-Reply-To: <1385262952-29240-1-git-send-email-amdragon@mit.edu>\r
+References: <1385262952-29240-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.16+175~g19e97d6 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 24 Nov 2013 19:08:40 +0200\r
+Message-ID: <m2ob59682v.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: pi-notmuch@pihost.us\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: Sun, 24 Nov 2013 17:08:53 -0000\r
+\r
+On Sun, Nov 24 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> Support for dirent.d_type is OS-specific. Previously, we used\r
+> _DIRENT_HAVE_D_TYPE to detect support for this, but this is apparently\r
+> a glic-ism (FreeBSD, for example, supports d_type, but does not define\r
+> this). Since there's no cross-platform way to detect support for\r
+> dirent.d_type, detect it using a test compile at configure time.\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+> compat/have_d_type.c | 10 ++++++++++\r
+> configure | 16 ++++++++++++++++\r
+> notmuch-new.c | 2 +-\r
+> 3 files changed, 27 insertions(+), 1 deletion(-)\r
+> create mode 100644 compat/have_d_type.c\r
+>\r
+> diff --git a/compat/have_d_type.c b/compat/have_d_type.c\r
+> new file mode 100644\r
+> index 0000000..9ca6c6e\r
+> --- /dev/null\r
+> +++ b/compat/have_d_type.c\r
+> @@ -0,0 +1,10 @@\r
+> +#include <dirent.h>\r
+> +\r
+> +int main()\r
+> +{\r
+> + struct dirent ent;\r
+> +\r
+> + (void) ent.d_type;\r
+> +\r
+> + return 0;\r
+> +}\r
+> diff --git a/configure b/configure\r
+> index 1a8e939..d2d193c 100755\r
+> --- a/configure\r
+> +++ b/configure\r
+> @@ -557,6 +557,17 @@ else\r
+> fi\r
+> rm -f compat/have_timegm\r
+> \r
+> +printf "Checking for dirent.d_type... "\r
+> +if ${CC} -o compat/have_d_type "$srcdir"/compat/have_d_type.c > /dev/null 2>&1\r
+> +then\r
+> + printf "Yes.\n"\r
+> + have_d_type="1"\r
+> +else\r
+> + printf "No (will use stat instead).\n"\r
+> + have_d_type="0"\r
+> +fi\r
+> +rm -f compat/have_d_type\r
+> +\r
+> printf "Checking for standard version of getpwuid_r... "\r
+> if ${CC} -o compat/check_getpwuid "$srcdir"/compat/check_getpwuid.c > /dev/null 2>&1\r
+> then\r
+> @@ -745,6 +756,9 @@ HAVE_STRCASESTR = ${have_strcasestr}\r
+> # build its own version)\r
+> HAVE_STRSEP = ${have_strsep}\r
+> \r
+> +# Whether struct dirent has d_type (if not, then notmuch will use stat)\r
+> +HAVE_D_TYPE = ${have_d_type}\r
+> +\r
+> # Whether the Xapian version in use supports compaction\r
+> HAVE_XAPIAN_COMPACT = ${have_xapian_compact}\r
+> \r
+> @@ -805,6 +819,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\\r
+> \$(VALGRIND_CFLAGS) \\\r
+> -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\\r
+> -DHAVE_STRSEP=\$(HAVE_STRSEP) \\\r
+> + -DHAVE_D_TYPE=\$(HAVE_D_TYPE) \\\r
+> -DSTD_GETPWUID=\$(STD_GETPWUID) \\\r
+> -DSTD_ASCTIME=\$(STD_ASCTIME) \\\r
+> -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)\r
+> @@ -813,6 +828,7 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\\r
+> \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\\r
+> -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\\r
+> -DHAVE_STRSEP=\$(HAVE_STRSEP) \\\r
+> + -DHAVE_D_TYPE=\$(HAVE_D_TYPE) \\\r
+> -DSTD_GETPWUID=\$(STD_GETPWUID) \\\r
+> -DSTD_ASCTIME=\$(STD_ASCTIME) \\\r
+> -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)\r
+> diff --git a/notmuch-new.c b/notmuch-new.c\r
+> index ba05cb4..423e188 100644\r
+> --- a/notmuch-new.c\r
+> +++ b/notmuch-new.c\r
+> @@ -167,7 +167,7 @@ dirent_type (const char *path, const struct dirent *entry)\r
+> char *abspath;\r
+> int err, saved_errno;\r
+> \r
+> -#ifdef _DIRENT_HAVE_D_TYPE\r
+> +#if HAVE_D_TYPE\r
+> /* Mapping from d_type to stat mode_t. We omit DT_LNK so that\r
+> * we'll fall through to stat and get the real file type. */\r
+> static const mode_t modes[] = {\r
+> -- \r
+> 1.8.4.rc3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff