From 72bc95ab83e9fbb1b235ce7d47f058b63efeca50 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sun, 4 Oct 2009 23:24:17 +0000
Subject: [PATCH] * disable dspam stuff its anywhere near production ready *
 add VDIR functionality

---
 citadel/Makefile.in  | 15 ++++++++++++---
 citadel/bootstrap    |  3 +++
 citadel/configure.ac | 41 +++++++++++++++++++++++++++--------------
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index a109b1831..a680e24d6 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -12,6 +12,10 @@
 #
 ########################################################################
 
+prefix=@prefix@
+srcdir=@srcdir@
+VPATH=$(srcdir)
+
 TARGETS=@TARGETS@
 RUN_DIR=@MAKE_RUN_DIR@
 SPOOL_DIR=@MAKE_SPOOL_DIR@
@@ -43,8 +47,6 @@ UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
 	getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT) \
 	ctdlmigrate$(EXEEXT)
 
-prefix=@prefix@
-srcdir=@srcdir@
 
 ACLOCAL=@ACLOCAL@
 AUTH=@AUTH@
@@ -69,7 +71,6 @@ YACC=@YACC@
 
 # End configuration section
 
-VPATH=$(srcdir)
 
 SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \
 	citmail.c citserver.c client_chat.c client_passwords.c \
@@ -87,6 +88,14 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \
 
 include Make_sources
 
+# for VPATH builds (invoked by configure)
+mkdir-init:
+	DIRS=`/bin/ls $(VPATH)/modules/`
+	echo $(DIRS)
+	@for d in `/bin/ls $(VPATH)/modules/`; do \
+		(mkdir -p modules/$$d ) ; \
+	done
+
 svn_revision.c: ${SOURCES}
 	./mk_svn_revision.sh
 
diff --git a/citadel/bootstrap b/citadel/bootstrap
index d14671ffd..94f101f2a 100755
--- a/citadel/bootstrap
+++ b/citadel/bootstrap
@@ -25,6 +25,9 @@ autoheader
 echo ... running mk_svn_revision.sh ...
 ./mk_svn_revision.sh
 
+echo ... running mk_module_init.sh ...
+./mk_module_init.sh
+
 echo
 echo This script has been tested with autoconf 2.53 and
 echo automake 1.5. Other versions may work, but we recommend
diff --git a/citadel/configure.ac b/citadel/configure.ac
index 1b8643023..56995a3c0 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -710,17 +710,17 @@ fi
 
 
 dnl Checks for the libdspam mail spam scanning library.
-if test "x$with_libdspam" != xno ; then
-	AC_CHECK_HEADERS(dspam/libdspam.h,
-		[AC_CHECK_LIB(dspam, dspam_init,
-			[ok_libdspam=yes],,
-	)])
-fi
-
-if test "x$ok_libdspam" = xyes ; then
-	SERVER_LIBS="-ldspam $SERVER_LIBS"
-	AC_DEFINE(HAVE_LIBDSPAM, [], [(unfinished) define this if you have the libdspam mail spam scanning library available])
-fi
+dnl if test "x$with_libdspam" != xno ; then
+dnl 	AC_CHECK_HEADERS(dspam/libdspam.h,
+dnl 		[AC_CHECK_LIB(dspam, dspam_init,
+dnl 			[ok_libdspam=yes],,
+dnl 	)])
+dnl fi
+dnl 
+dnl if test "x$ok_libdspam" = xyes ; then
+dnl 	SERVER_LIBS="-ldspam $SERVER_LIBS"
+dnl 	AC_DEFINE(HAVE_LIBDSPAM, [], [(unfinished) define this if you have the libdspam mail spam scanning library available])
+dnl fi
 
 
 
@@ -991,19 +991,32 @@ AC_SUBST(DATABASE)
 AC_SUBST(SERVER_LDFLAGS)
 AC_SUBST(SERVER_LIBS)
 AC_SUBST(SETUP_LIBS)
-./mk_module_init.sh
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT(database_cleanup.sh)
 
-
 if test -z "$DATABASE"; then
 	AC_MSG_WARN([No database driver was found. Please install Berkeley DB.])
 fi
 
+abs_srcdir="`cd $srcdir && pwd`"
+abs_builddir="`pwd`"
+if test "$abs_srcdir" != "$abs_builddir"; then
+   ln -s $abs_srcdir/include $abs_builddir
+   ln -s $abs_srcdir/Make_sources $abs_builddir
+   ln -s $abs_srcdir/Make_modules $abs_builddir
+   ln -s $abs_srcdir/*.h $abs_builddir
+   make mkdir-init
+fi
+
+if test -n "$srcdir"; then 
+   export srcdir=.
+fi
+
+
 echo ------------------------------------------------------------------------
 echo 'LDAP support:                    ' $ok_ldap
 echo 'Character set conversion support:' $ok_iconv
-echo 'DSpam Scanning support:          ' $ok_libdspam
+dnl echo 'DSpam Scanning support:          ' $ok_libdspam
 echo 
 echo 'Note: if you are not using Linux, make sure you are using GNU make'
 echo '(gmake) to compile Citadel.'
-- 
2.30.2