mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 01:14:53 +01:00
new: Detect dirent.d_type support at configure time
Support for dirent.d_type is OS-specific. Previously, we used _DIRENT_HAVE_D_TYPE to detect support for this, but this is apparently a glic-ism (FreeBSD, for example, supports d_type, but does not define this). Since there's no cross-platform way to detect support for dirent.d_type, detect it using a test compile at configure time.
This commit is contained in:
parent
aaa7f0d92e
commit
b1fa95721b
3 changed files with 27 additions and 1 deletions
10
compat/have_d_type.c
Normal file
10
compat/have_d_type.c
Normal file
|
@ -0,0 +1,10 @@
|
|||
#include <dirent.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
struct dirent ent;
|
||||
|
||||
(void) ent.d_type;
|
||||
|
||||
return 0;
|
||||
}
|
16
configure
vendored
16
configure
vendored
|
@ -578,6 +578,17 @@ else
|
|||
fi
|
||||
rm -f compat/have_timegm
|
||||
|
||||
printf "Checking for dirent.d_type... "
|
||||
if ${CC} -o compat/have_d_type "$srcdir"/compat/have_d_type.c > /dev/null 2>&1
|
||||
then
|
||||
printf "Yes.\n"
|
||||
have_d_type="1"
|
||||
else
|
||||
printf "No (will use stat instead).\n"
|
||||
have_d_type="0"
|
||||
fi
|
||||
rm -f compat/have_d_type
|
||||
|
||||
printf "Checking for standard version of getpwuid_r... "
|
||||
if ${CC} -o compat/check_getpwuid "$srcdir"/compat/check_getpwuid.c > /dev/null 2>&1
|
||||
then
|
||||
|
@ -769,6 +780,9 @@ HAVE_STRCASESTR = ${have_strcasestr}
|
|||
# build its own version)
|
||||
HAVE_STRSEP = ${have_strsep}
|
||||
|
||||
# Whether struct dirent has d_type (if not, then notmuch will use stat)
|
||||
HAVE_D_TYPE = ${have_d_type}
|
||||
|
||||
# Whether the Xapian version in use supports compaction
|
||||
HAVE_XAPIAN_COMPACT = ${have_xapian_compact}
|
||||
|
||||
|
@ -829,6 +843,7 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
|
|||
\$(VALGRIND_CFLAGS) \\
|
||||
-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\
|
||||
-DHAVE_STRSEP=\$(HAVE_STRSEP) \\
|
||||
-DHAVE_D_TYPE=\$(HAVE_D_TYPE) \\
|
||||
-DSTD_GETPWUID=\$(STD_GETPWUID) \\
|
||||
-DSTD_ASCTIME=\$(STD_ASCTIME) \\
|
||||
-DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT) \\
|
||||
|
@ -839,6 +854,7 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
|
|||
\$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\
|
||||
-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\
|
||||
-DHAVE_STRSEP=\$(HAVE_STRSEP) \\
|
||||
-DHAVE_D_TYPE=\$(HAVE_D_TYPE) \\
|
||||
-DSTD_GETPWUID=\$(STD_GETPWUID) \\
|
||||
-DSTD_ASCTIME=\$(STD_ASCTIME) \\
|
||||
-DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT) \\
|
||||
|
|
|
@ -173,7 +173,7 @@ dirent_type (const char *path, const struct dirent *entry)
|
|||
char *abspath;
|
||||
int err, saved_errno;
|
||||
|
||||
#ifdef _DIRENT_HAVE_D_TYPE
|
||||
#if HAVE_D_TYPE
|
||||
/* Mapping from d_type to stat mode_t. We omit DT_LNK so that
|
||||
* we'll fall through to stat and get the real file type. */
|
||||
static const mode_t modes[] = {
|
||||
|
|
Loading…
Reference in a new issue