X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fconfigure.ac;h=820f91dc2a9702012412414830ea9a728087078d;hb=c08adcea52e85d6139ad158c17eb3d1941df2eb5;hp=20753a379266d67ad7403221b73e0f3e20fb0070;hpb=cd39850a3746f8a5bf1f4c082afd3a8d644f9f3c;p=citadel.git

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 20753a379..820f91dc2 100644
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
-AC_INIT([WebCit], [7.64], [http://www.citadel.org/])
+AC_INIT([WebCit], [7.86], [http://www.citadel.org/])
 
 
 AC_SUBST(PROG_SUBDIRS)
@@ -88,6 +88,33 @@ dnl Checks for header files.
 AC_HEADER_STDC
 dnl AC_HEADER_SYS_WAIT
 
+AC_CACHE_CHECK(
+	[for call semantics from getpwuid_r], 
+	ac_cv_call_getpwuid_r,
+	[AC_TRY_COMPILE([#include <sys/types.h>
+#include <pwd.h>], 
+                         [
+				struct passwd pw, *pwp;
+				char pwbuf[64];
+				uid_t uid;
+
+				getpwuid_r(uid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+			],
+			ac_cv_call_getpwuid_r=yes, 
+			ac_cv_call_getpwuid_r=no)
+	])
+
+if test $ac_cv_call_getpwuid_r = no; then
+	AC_DEFINE(SOLARIS_GETPWUID,[],[do we need to use solaris call syntax?])
+	AC_DEFINE(SOLARIS_LOCALTIME_R,[], [do we need to use soralis call syntax?])
+	AC_DEFINE(F_UID_T, "%ld", [whats the matching format string for uid_t?])
+	AC_DEFINE(F_PID_T, "%ld",  [whats the matching format string for pid_t?])
+	AC_DEFINE(F_XPID_T, "%lx",  [whats the matching format string for xpid_t?])
+else
+	AC_DEFINE(F_UID_T, "%d",  [whats the matching format string for uid_t?])
+	AC_DEFINE(F_PID_T, "%d",  [whats the matching format string for pid_t?])
+	AC_DEFINE(F_XPID_T, "%x",  [whats the matching format string for xpid_t?])
+fi
 
 
 
@@ -95,12 +122,21 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
+dnl Check the size of various builtin types; see typesize.h (error)
+AC_CHECK_SIZEOF(char, 0)
+AC_CHECK_SIZEOF(short, 0)
+AC_CHECK_SIZEOF(int, 0)
+AC_CHECK_SIZEOF(long, 0)
+AC_CHECK_SIZEOF(long unsigned int, 0)
+AC_CHECK_SIZEOF(size_t, 0)
 dnl AC_HEADER_TIME
 
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
 dnl AC_FUNC_VPRINTF
 AC_REPLACE_FUNCS(snprintf)
+AC_CHECK_HEADER(CUnit/CUnit.h, [AC_DEFINE(ENABLE_TESTS, [], [whether we should compile the test-suite])])
+
 AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h iconv.h xlocale.h)
 
 dnl Checks for the zlib compression library.
@@ -116,6 +152,7 @@ dnl  libcitadel will bring libz, so we don't need it here.     LDFLAGS="-lz $LDF
        AC_DEFINE(HAVE_ZLIB, [], [define this if you have zlib compression available])
 fi
 
+
 dnl Here is the check for a libc integrated iconv
 AC_ARG_ENABLE(iconv,
 	[  --disable-iconv         do not use iconv charset conversion],
@@ -166,12 +203,13 @@ if test "$ok_iconv" = no; then
 		)
 fi	
 if test "$ok_iconv" != "no"; then
-	AC_MSG_RESULT(WebCit will be built with character set conversion.)
+	AC_MSG_RESULT(webcit will be built with character set conversion.)
 	AC_DEFINE(HAVE_ICONV,[],[whether we have iconv for charset conversion])
 else
-	AC_MSG_RESULT(WebCit will be built without character set conversion.)
+	AC_MSG_RESULT(webcit will be built without character set conversion.)
 fi
 
+
 AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"])
 
 
@@ -463,9 +501,31 @@ AC_ARG_WITH(editordir,
 )
 AC_DEFINE_UNQUOTED(EDITORDIR, "$editordir", [where to find our mail editor])
 
-./mk_module_init.sh
+abs_srcdir="`cd $srcdir && pwd`"
+abs_builddir="`pwd`"
+if test "$abs_srcdir" != "$abs_builddir"; then
+   CFLAGS="$CFLAGS -I $abs_builddir"
+fi
 AC_CONFIG_HEADER(sysdep.h)
-AC_OUTPUT(Makefile po/Makefile )
+AC_OUTPUT(Makefile po/Makefile tests/Makefile)
+
+if test "$abs_srcdir" != "$abs_builddir"; then
+   ln -s $abs_srcdir/static $abs_builddir
+   ln -s $abs_srcdir/tiny_mce $abs_builddir
+   ln -s $abs_srcdir/*.h $abs_builddir
+   make mkdir-init
+   
+else
+dnl just run it on devel systems and if non vdir build.
+   if test -d .svn; then
+      ./mk_module_init.sh
+   fi
+fi
+
+if test -n "$srcdir"; then 
+   export srcdir=.
+fi
+
 
 echo ------------------------------------------------------------------------
 echo 'Character set conversion support:' $ok_iconv