Improved default automatic detection of Pigoenhole include directory. default tip
authorStephan Bosch <stephan@rename-it.nl>
Sun Dec 16 11:31:47 2012 +0100 (2012-12-16)
changeset 359b3dd53f587c
parent 34 c926a6dd3736
Improved default automatic detection of Pigoenhole include directory.
configure.in
m4/pigeonhole.m4
src/Makefile.am
     1.1 --- a/configure.in	Sun Dec 16 10:43:05 2012 +0100
     1.2 +++ b/configure.in	Sun Dec 16 11:31:47 2012 +0100
     1.3 @@ -19,14 +19,6 @@
     1.4  
     1.5  AC_PROG_LIBTOOL
     1.6  
     1.7 -DC_DOVECOT
     1.8 -DC_DOVECOT_MODULEDIR
     1.9 -
    1.10 -LIBDOVECOT_INCLUDE="$LIBDOVECOT_INCLUDE $LIBDOVECOT_STORAGE_INCLUDE"
    1.11 -CFLAGS="$DOVECOT_CFLAGS"
    1.12 -LIBS="$DOVECOT_LIBS"
    1.13 -AC_SUBST(LIBDOVECOT_INCLUDE)
    1.14 -
    1.15  DC_PIGEONHOLE
    1.16  
    1.17  AC_CONFIG_FILES([
     2.1 --- a/m4/pigeonhole.m4	Sun Dec 16 10:43:05 2012 +0100
     2.2 +++ b/m4/pigeonhole.m4	Sun Dec 16 11:31:47 2012 +0100
     2.3 @@ -3,10 +3,18 @@
     2.4  # Current implementation is ugly and needs improvement
     2.5  
     2.6  AC_DEFUN([DC_PIGEONHOLE],[
     2.7 +	DC_DOVECOT
     2.8 +	DC_DOVECOT_MODULEDIR
     2.9 +
    2.10 +	LIBDOVECOT_INCLUDE="$LIBDOVECOT_INCLUDE $LIBDOVECOT_STORAGE_INCLUDE"
    2.11 +	CFLAGS="$DOVECOT_CFLAGS"
    2.12 +	LIBS="$DOVECOT_LIBS"
    2.13 +	AC_SUBST(LIBDOVECOT_INCLUDE)
    2.14 +
    2.15  	AC_ARG_WITH(pigeonhole,
    2.16  	[  --with-pigeonhole=DIR   Pigeonhole base directory],
    2.17 -    	pigeonholedir="$withval",
    2.18 -	    pigeonholedir=../dovecot-2.0-pigeonhole
    2.19 +	pigeonholedir="$withval",
    2.20 +	pigeonholedir="$dovecot_pkgincludedir/sieve"
    2.21  	)
    2.22  
    2.23  	AC_MSG_CHECKING([for pigeonhole in "$pigeonholedir"])
    2.24 @@ -24,6 +32,7 @@
    2.25  		LIBSIEVE_INCLUDE='\
    2.26  			-I$(pigeonhole_incdir) \
    2.27  			-I$(pigeonhole_incdir)/src/lib-sieve \
    2.28 +			-I$(pigeonholedir)/src/lib-sieve/plugins/copy \
    2.29  			-I$(pigeonholedir)/src/lib-sieve/plugins/enotify \
    2.30  			-I$(pigeonholedir)/src/lib-sieve/plugins/variables'
    2.31  		if test -f "$pigeonholedir/src/testsuite/testsuite"; then
    2.32 @@ -56,10 +65,7 @@
    2.33  	want_valgrind=no)
    2.34  	AM_CONDITIONAL(PIGEONHOLE_TESTSUITE_VALGRIND, test "$want_valgrind" = "yes")
    2.35  
    2.36 -	sieve_plugindir="$dovecot_moduledir/sieve"
    2.37 -
    2.38  	AC_SUBST(pigeonhole_incdir)
    2.39 -	AC_SUBST(sieve_plugindir)
    2.40  
    2.41  	AC_SUBST(LIBSIEVE_INCLUDE)
    2.42  	AC_SUBST(PIGEONHOLE_TESTSUITE)
     3.1 --- a/src/Makefile.am	Sun Dec 16 10:43:05 2012 +0100
     3.2 +++ b/src/Makefile.am	Sun Dec 16 11:31:47 2012 +0100
     3.3 @@ -1,3 +1,4 @@
     3.4 +sieve_plugindir = $(moduledir)/sieve
     3.5  
     3.6  sieve_plugin_LTLIBRARIES = lib90_sieve_extdata_plugin.la
     3.7