diff options
| -rw-r--r-- | compat/check_getpwuid.c | 11 | ||||
| -rw-r--r-- | compat/compat.h | 4 | ||||
| -rwxr-xr-x | configure | 23 |
3 files changed, 36 insertions, 2 deletions
diff --git a/compat/check_getpwuid.c b/compat/check_getpwuid.c new file mode 100644 index 00000000..c435eb89 --- /dev/null +++ b/compat/check_getpwuid.c @@ -0,0 +1,11 @@ +#include <stdio.h> +#include <pwd.h> + +int main() +{ + struct passwd passwd, *ignored; + + (void) getpwuid_r (0, &passwd, NULL, 0, &ignored); + + return (0); +} diff --git a/compat/compat.h b/compat/compat.h index b2e27368..c1ee0f93 100644 --- a/compat/compat.h +++ b/compat/compat.h @@ -30,6 +30,10 @@ extern "C" { #endif +#if !STD_GETPWUID +#define _POSIX_PTHREAD_SEMANTICS 1 +#endif + #if !HAVE_GETLINE #include <stdio.h> #include <unistd.h> @@ -519,6 +519,17 @@ else fi rm -f compat/have_strcasestr +printf "Checking for standard version of getpwuid_r... " +if ${CC} -o compat/check_getpwuid "$srcdir"/compat/check_getpwuid.c > /dev/null 2>&1 +then + printf "Yes.\n" + std_getpwuid=1 +else + printf "No (will define _POSIX_PTHREAD_SEMANTICS to get it).\n" + std_getpwuid=0 +fi +rm -f compat/check_getpwuid + printf "int main(void){return 0;}\n" > minimal.c printf "Checking for rpath support... " @@ -681,6 +692,11 @@ HAVE_GETLINE = ${have_getline} # build its own version) HAVE_STRCASESTR = ${have_strcasestr} +# Whether the getpwuid_r function is standards-compliant +# (if not, then notmuch will #define _POSIX_PTHREAD_SEMANTICS +# to enable the standards-compliant version -- needed for Solaris) +STD_GETPWUID = ${std_getpwuid} + # Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD, OPENBSD PLATFORM = ${platform} @@ -725,10 +741,13 @@ WITH_ZSH = ${WITH_ZSH} # Combined flags for compiling and linking against all of the above CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ - \$(VALGRIND_CFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) + \$(VALGRIND_CFLAGS) \\ + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ + -DSTD_GETPWUID=\$(STD_GETPWUID) CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ - -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ + -DSTD_GETPWUID=\$(STD_GETPWUID) CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) EOF |