From d998b681bf300afe2f3de0408134722b913d464a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Mon, 5 Oct 2009 20:25:07 +0000
Subject: [PATCH] * VDIR build here too.

---
 webcit/Makefile.in  | 11 ++++++++---
 webcit/bootstrap    |  4 ++++
 webcit/configure.ac | 24 +++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index d2ab5a0c5..f9df1cb6a 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -1,5 +1,9 @@
 # $Id$
 
+prefix=@prefix@
+srcdir=@srcdir@
+VPATH=$(srcdir)
+
 AUTOCONF=@AUTOCONF@
 CC=@CC@
 CFLAGS=@CFLAGS@
@@ -11,9 +15,6 @@ LDFLAGS=@LDFLAGS@
 SED=@SED@
 SETUP_LIBS=@SETUP_LIBS@
 PTHREAD_DEFS=@PTHREAD_DEFS@
-srcdir=@srcdir@
-prefix=@prefix@
-top_builddir=`pwd`
 LIB_SUBDIRS=
 PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
@@ -24,6 +25,10 @@ WWWDIR=@WWWDIR@
 
 all: all-progs-recursive webcit setup
 
+# for VPATH builds (invoked by configure)
+mkdir-init:
+	mkdir locale
+
 
 .SUFFIXES: .cpp .c .o
 
diff --git a/webcit/bootstrap b/webcit/bootstrap
index 4d7ca56d7..cc325f548 100755
--- a/webcit/bootstrap
+++ b/webcit/bootstrap
@@ -24,6 +24,10 @@ rm -rf autom4te*.cache
 echo ... running autoheader ...
 autoheader
 
+echo ... 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 I recommend the latest
diff --git a/webcit/configure.ac b/webcit/configure.ac
index 7a5d408a7..5b66eb692 100644
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -465,10 +465,32 @@ 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 )
 
+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
 echo 'National language support:       ' $ok_nls
-- 
2.30.2