--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 1929E431FD5\r
+ for <notmuch@notmuchmail.org>; Sat, 23 Nov 2013 19:16:13 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 gOj9JCQrZZKO for <notmuch@notmuchmail.org>;\r
+ Sat, 23 Nov 2013 19:16:05 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
+ [18.9.25.12])\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 D8122431FCB\r
+ for <notmuch@notmuchmail.org>; Sat, 23 Nov 2013 19:16:04 -0800 (PST)\r
+X-AuditID: 1209190c-b7f7f6d000000bbd-84-52916f732467\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ (using TLS with cipher AES256-SHA (256/256 bits))\r
+ (Client did not present a certificate)\r
+ by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 81.BF.03005.47F61925; Sat, 23 Nov 2013 22:16:04 -0500 (EST)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id rAO3G01R003508; \r
+ Sat, 23 Nov 2013 22:16:01 -0500\r
+Received: from drake.dyndns.org\r
+ (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [216.15.114.40]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id rAO3Fw0n006349\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 23 Nov 2013 22:16:00 -0500\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1VkQAw-0007cL-Ay; Sat, 23 Nov 2013 22:15:58 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] new: Detect dirent.d_type support at configure time\r
+Date: Sat, 23 Nov 2013 22:15:52 -0500\r
+Message-Id: <1385262952-29240-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsUixCmqrVuSPzHIYNFVVovrN2cyWxw928Pm\r
+ wOTxbNUtZo+VLy6zBzBFcdmkpOZklqUW6dslcGXc/v+HtaBZqmLZ0egGxknCXYycHBICJhKP\r
+ fy1ihbDFJC7cW8/WxcjFISQwm0ni+N4LzBDORkaJTRfaWSGcO0wSzafWQjlzGSX+9s9lA+ln\r
+ E9CQ2LZ/OSOILSIgLbHz7mywucwCNhKf9r9lBrGFBVwket41gcVZBFQlns/ewAJi8wo4SNxe\r
+ cJQJ4g4liYWntrFOYORdwMiwilE2JbdKNzcxM6c4NVm3ODkxLy+1SNdQLzezRC81pXQTIzg0\r
+ JHl2ML45qHSIUYCDUYmHV+D+hCAh1sSy4srcQ4ySHExKoryLciYGCfEl5adUZiQWZ8QXleak\r
+ Fh9ilOBgVhLh7YoHyvGmJFZWpRblw6SkOViUxHlvctgHCQmkJ5akZqemFqQWwWRlODiUJHil\r
+ 8oAaBYtS01Mr0jJzShDSTBycIMN5gIY7g9TwFhck5hZnpkPkTzEqSonzvs0FSgiAJDJK8+B6\r
+ YbH7ilEc6BVhXhOQdh5g3MN1vwIazAQ0mF2yG2RwSSJCSqqB0SqKvW76s5bv3GFWa8vWv1Iv\r
+ 7VubHrfo8SUX+9xMW7FNM8rD+jMWqijtfR/hEzr7eA2D39P8Mrml/gI3JpzcHvKeRWnD3/XZ\r
+ ucGzC+8LhUrOtl6ybNOkpCNBBUe8a6p+ND6dm/DvgquX8I0d6kEHKnLfpS++FdGjM8lbQKr0\r
+ UW6Sc2nN7P0FSizFGYmGWsxFxYkAigEnHbgCAAA=\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 03:16:13 -0000\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
+ 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
projects / notmuch-archives.git / commitdiff