[dovecot-cvs] dovecot-sieve configure.in,1.3,1.4

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot-sieve
In directory talvi:/tmp/cvs-serv27650

Modified Files:
	configure.in 
Log Message:
Support compiling against installed dovecot-config and headers. This way
sievec and sieved aren't compiled though because liblib.a doesn't exist.



Index: configure.in
===================================================================
RCS file: /var/lib/cvs/dovecot-sieve/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.in	18 Jan 2007 17:29:22 -0000	1.3
+++ configure.in	22 Feb 2007 21:52:30 -0000	1.4
@@ -26,13 +26,27 @@
 if ! test -f "$dovecotdir/dovecot-config"; then
   echo
   echo "dovecot-config not found from $dovecotdir, use --with-dovecot=PATH"
-  echo "to give path to compiled Dovecot sources."
+  echo "to give path to compiled Dovecot sources or to a directory with the"
+  echo "installed dovecot-config file."
   AC_MSG_ERROR([dovecot-config not found])
 fi
 
+if test -d "$dovecotdir/src"; then
+  # compiling against sources
+  have_dovecot_libs=yes
+else
+  # compiling against installed headers
+  have_dovecot_libs=no
+fi
+AM_CONDITIONAL(HAVE_DOVECOT_LIBS, test "$have_dovecot_libs" = "yes")
+
 dnl replace relative ../ paths in the file with full paths
 eval `cat $dovecotdir/dovecot-config|sed 's,\$(top_builddir)/,$dovecotdir/,g'`
 
+if test $have_dovecot_libs = yes; then
+  dovecot_incdir="$dovecotdir"
+fi
+
 dnl * Regexp library check, from Cyrus IMAP
 AC_SEARCH_LIBS(regcomp, rx regex, [
   CFLAGS="$CFLAGS -DENABLE_REGEX"
@@ -42,7 +56,7 @@
 AC_SUBST(LIBICONV)
 AC_SUBST(RAND_LIBS)
 AC_SUBST(MODULE_LIBS)
-AC_SUBST(dovecotdir)
+AC_SUBST(dovecot_incdir)
 AC_SUBST(moduledir)
 
 AC_CONFIG_FILES([