X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fconfigure.ac;h=6485534c22b52660a03682254c93134702b188a4;hb=c82a9b990b775ffd78b18925dbc00c7bb06e0a24;hp=4ce75792be46007f1b688ecb4d54d1d261349926;hpb=898bab06ba7d6cf04a9b5e41bfcc6319ff3bb8de;p=citadel.git

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 4ce75792b..6485534c2 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], [8.10], [http://www.citadel.org/])
+AC_INIT([WebCit], [8.20], [http://www.citadel.org/])
 
 
 AC_SUBST(PROG_SUBDIRS)
@@ -252,6 +252,35 @@ AC_CHECK_HEADER(libcitadel.h,
 	]
 )
 
+AC_MSG_CHECKING([whether your system likes memcpy + HKEY]) 
+AC_TRY_COMPILE([
+#define _GNU_SOURCE
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/select.h>
+#include <fcntl.h>
+#include <sys/types.h>
+
+#include "lib/libcitadel.h"
+],
+[
+	char foo[22];
+	memcpy(foo, HKEY("foo"));
+	
+],
+		[
+
+		  AC_MSG_RESULT([yes])
+		],
+		[ 
+		  AC_DEFINE(UNDEF_MEMCPY, [], [whether we need to undefine memcpy])
+		  AC_MSG_RESULT([no])
+		]
+)
 
 dnl Checks for the Expat XML parser.
 AC_CHECK_HEADER(expat.h,
@@ -400,6 +429,11 @@ AC_ARG_WITH(ssldir,
 )
 AC_DEFINE_UNQUOTED(SSL_DIR, "$ssl_dir", [were should we put our keys?])
 
+
+
+
+AC_CHECK_FUNCS(strftime_l uselocale gettext)
+
 if test "$ok_nls" != "no"; then
 	AC_CHECK_PROG(ok_xgettext, xgettext, yes, no)
 	ok_nls=$ok_xgettext
@@ -416,8 +450,11 @@ if test "$ok_nls" != "no"; then
 fi
 
 if test "$ok_nls" != "no"; then
-	AC_CHECK_FUNCS(strftime_l uselocale gettext)
+	AC_MSG_RESULT(WebCit will be built with national language support.)
+	AC_DEFINE(ENABLE_NLS, [], [whether we have NLS support])
 	PROG_SUBDIRS="$PROG_SUBDIRS po/webcit/"
+else
+	AC_MSG_RESULT(WebCit will be built without national language support.)
 fi
 
 AC_SUBST(SETUP_LIBS)
@@ -449,12 +486,14 @@ if test "$prefix" = NONE; then
 	wwwdir=$ac_default_prefix
 	rundir=$ac_default_prefix
 	editordir=$ac_default_prefix/tiny_mce
+	etcdir=$ac_default_prefix
 else
 	localedir=$prefix
 	wwwdir=$prefix
 	datadir=$prefix
 	rundir=$prefix
 	editordir=$prefix/tiny_mce
+	etcdir=$prefix
 fi
 
 dnl where to put the locale files
@@ -515,6 +554,18 @@ AC_ARG_WITH(editordir,
 )
 AC_DEFINE_UNQUOTED(EDITORDIR, "$editordir", [where to find our mail editor])
 
+dnl Checks where to find our configs
+AC_ARG_WITH(etcdir, 
+		    [  --with-etcdir             directory to read our configs],
+			[ if test "x$withval" != "xno" ; then
+				etcdir=$withval
+			  fi
+			]
+)
+AC_DEFINE_UNQUOTED(ETCDIR, "$etcdir", [where to find our configs])
+ETCDIR=$etcdir
+AC_SUBST(ETCDIR)
+
 abs_srcdir="`cd $srcdir && pwd`"
 abs_builddir="`pwd`"
 if test "$abs_srcdir" != "$abs_builddir"; then