-diff -ruN dovecot-2.1-pigeonhole-0.3.1/configure dovecot-2.1-pigeonhole-0.3.1-new/configure
---- dovecot-2.1-pigeonhole-0.3.1/configure 2012-05-25 21:32:09.000000000 +0000
-+++ dovecot-2.1-pigeonhole-0.3.1/configure 2012-06-10 09:46:34.761871135 +0000
-@@ -11385,19 +11385,19 @@
+--- dovecot-2.2-pigeonhole-0.4.12/configure 2016-02-06 09:54:27.000000000 +0000
++++ dovecot-2.2-pigeonhole-0.4.12/configure 2016-03-17 09:40:36.131768000 +0000
+@@ -11731,19 +11731,19 @@
fi
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dovecot-config in \"$dovecotdir\"" >&5
--$as_echo_n "checking for dovecot-config in \"$dovecotdir\"... " >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"$dovecotdir/dovecot-config\"" >&5
+-$as_echo_n "checking for \"$dovecotdir/dovecot-config\"... " >&6; }
- if test -f "$dovecotdir/dovecot-config"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dovecotdir/dovecot-config" >&5
-$as_echo "$dovecotdir/dovecot-config" >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dovecot-devel in \"$dovecotdir\"" >&5
-+$as_echo_n "checking for dovecot-devel in \"$dovecotdir\"... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"$dovecotdir/dovecot-devel\"" >&5
++$as_echo_n "checking for \"$dovecotdir/dovecot-devel\"... " >&6; }
+ if test -f "$dovecotdir/../dovecot-devel"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dovecotdir/../dovecot-devel" >&5
+$as_echo "$dovecotdir/../dovecot-devel" >&6; }
fi
old=`pwd`
-@@ -11406,8 +11406,8 @@
+@@ -11752,8 +11752,8 @@
cd $old
DISTCHECK_CONFIGURE_FLAGS="--with-dovecot=$abs_dovecotdir --without-dovecot-install-dirs"
+ eval `grep -i '^dovecot_[a-z_]*=' "$dovecotdir"/../dovecot-devel`
+ eval `grep '^LIBDOVECOT[A-Z_]*=' "$dovecotdir"/../dovecot-devel`
- if test "$use_install_dirs" = "no"; then
- dovecot_pkgincludedir='$(pkgincludedir)'
+ dovecot_installed_moduledir="$dovecot_moduledir"
+