* add documentation

[citadel.git] / webcit / configure.in

diff --git a/webcit/configure.in b/webcit/configure.in
index 12c6f11854a08a491588200f9d79549ec13b10a3..b937a0c913b1a7e1f6458bc880ac723a171375e8 100644 (file)
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -2,9 +2,13 @@ dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 dnl AC_CONFIG_AUX_DIR([autoconf])
 AC_INIT(src/webserver.c)
+AC_GNU_SOURCE
 AM_INIT_AUTOMAKE(webcit,6.72)
 AM_CONFIG_HEADER(config.h)
 AC_PROG_LIBTOOL
+
+dnl Make sure we see all GNU and Solaris extensions.
+
 #AC_CONFIG_HEADERS(sysdep.h)
 #AC_VERSION(6.72)
 #PACKAGE=gettext
@@ -45,7 +49,6 @@ AC_DEFINE([HAVE_OPENSSL],
        ]
 )
 
-AC_DEFINE([WEBCITDIR],"/usr/local/webcit",    [  --with-webcitdir             Directory Prefix])
 
 dnl Set some system-specific variables which are OK to set before compiler
 dnl checks:
@@ -319,7 +322,8 @@ else
        AC_MSG_RESULT(WebCit will be built without character set conversion.)
 fi
 
-
+AC_DEFINE_UNQUOTED([PREFIX],["$prefix"],where should we make our root?)
+dnl AC_SUBST(PREFIX)
 
 dnl dnl Here is the check for libintl etc.
 dnl 
@@ -377,7 +381,7 @@ dnl else
 dnl    AC_MSG_RESULT(WebCit will be built without national language support.)
 dnl fi
 dnl Checks for programs.
-AM_GNU_GETTEXT_VERSION([0.14.0])
+AM_GNU_GETTEXT_VERSION([0.14])
 
 #AM_GNU_GETTEXT
 # if we have intl/... 
@@ -387,12 +391,31 @@ IT_PROG_INTLTOOL
 AC_SUBST(CFLAGS)
 AC_SUBST(SETUP_LIBS)
 
+AC_ARG_WITH(rundir, [  --with-rundir=DIR          where to find the citadel servers sockets (overridable by -h  at runtime.)],
+                                          [ rundir=$withval ],[ rundir=/usr/local/citadel ] )
+AC_DEFINE_UNQUOTED([RUNDIR],["$rundir"],where should we make look for citadel sockets??)
 
 
-AC_ARG_WITH(staticdir, [  --with-staticdir=DIR          where to put datafiles],[ staticdir=$withval ],[ staticdir=$prefix/static/ ] )
+AC_ARG_WITH(staticdir, [  --with-staticdir=DIR          where to put datafiles],
+                                          [ staticdir=$withval ],[ staticdir=$prefix ] )
 AC_SUBST(staticdir)
+
+AC_ARG_WITH(staticrundir, [  --with-staticrundir=DIR          where to search datafiles at runtime],
+                                                 [ staticrundir=$withval ],[ staticrundir=$staticdir ] )
+
+AC_DEFINE_UNQUOTED([DATADIR],["$staticrundir"],where should we make our root?)
+
+
+AC_ARG_WITH(editor, [  --with-editor=DIR          where to search the editor at runtime],
+                                                 [ editordir=$withval ],[ editordir=$staticrundir ] )
+AC_DEFINE_UNQUOTED([EDITORDIR],["$editordir"],where find the editor (tiny_mce)?)
+
+AC_SUBST(editor)
+
+
 AC_OUTPUT(Makefile src/Makefile po/Makefile.in   )
 
+
 echo ------------------------------------------------------------------------
 echo 'zlib compression:                ' $ok_zlib
 echo 'Calendar support:                ' $ok_libical