Completed DVCA (Dump VCard Addresses) function. This function

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 7e76d37e65611df73b10eeb8b9e3e603081477dd..a3932c0f7f4450b10772c47c1e206a5aed759510 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.05], [http://www.citadel.org/])
+AC_INIT([Citadel], [7.10], [http://www.citadel.org/])
 AC_REVISION([$Revision$])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_PREFIX_DEFAULT(/usr/local/citadel)
@@ -610,8 +610,9 @@ if test $ac_cv_struct_ut_type = yes; then
 fi
 
 AC_CACHE_CHECK([for call semantics from getpwuid_r], ac_cv_call_getpwuid_r,
-[AC_TRY_COMPILE([#include <pwd.h>], [
-  struct passwd pw, *pwp = NULL;
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <pwd.h>], [
+  struct passwd pw, *pwp;
   char pwbuf[64];
   uid_t uid;
 
@@ -620,7 +621,14 @@ AC_CACHE_CHECK([for call semantics from getpwuid_r], ac_cv_call_getpwuid_r,
 ],
 ac_cv_call_getpwuid_r=yes, ac_cv_call_getpwuid_r=no)])
 if test $ac_cv_call_getpwuid_r = no; then
-       AC_DEFINE(BSD_GETPWUID)
+       AC_DEFINE(SOLARIS_GETPWUID)
+       AC_DEFINE(F_UID_T, "%ld")
+       AC_DEFINE(F_PID_T, "%ld")
+       AC_DEFINE(F_XPID_T, "%lx")
+else
+       AC_DEFINE(F_UID_T, "%d")
+       AC_DEFINE(F_PID_T, "%d")
+       AC_DEFINE(F_XPID_T, "%x")
 fi