dovecot-1.1: --with-vpopmail=path now also checks path/lib_deps ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/34b6694adfcd
changeset: 8200:34b6694adfcd
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Mar 13 18:06:14 2009 -0400
description:
--with-vpopmail=path now also checks path/lib_deps instead of only path/etc/lib_deps.

diffstat:

1 file changed, 11 insertions(+), 7 deletions(-)
configure.in |   18 +++++++++++-------

diffs (35 lines):

diff -r 4f35f1dfd1c7 -r 34b6694adfcd configure.in
--- a/configure.in	Fri Mar 13 17:26:41 2009 -0400
+++ b/configure.in	Fri Mar 13 18:06:14 2009 -0400
@@ -2125,12 +2125,16 @@ fi
 fi
 
 if test $want_vpopmail != no; then
-	vpop_libdeps="$vpopmail_home/etc/lib_deps"
-
-	AC_MSG_CHECKING([for vpopmail configuration at $vpop_libdeps])
-	if test -f $vpop_libdeps; then
-		AUTH_CFLAGS="$AUTH_CFLAGS `cat $vpopmail_home/etc/inc_deps` $CFLAGS"
-		AUTH_LIBS="$AUTH_LIBS `cat $vpop_libdeps`"
+	vpop_etc="$vpopmail_home/etc"
+	AC_MSG_CHECKING([for vpopmail configuration at $vpop_etc/lib_deps])
+	if ! test -f $vpop_etc/lib_deps; then
+		AC_MSG_RESULT(not found)
+		vpop_etc="$vpopmail_home"
+		AC_MSG_CHECKING([for vpopmail configuration at $vpop_etc/lib_deps])
+	fi
+	if test -f $vpop_etc/lib_deps; then
+		AUTH_CFLAGS="$AUTH_CFLAGS `cat $vpop_etc/inc_deps` $CFLAGS"
+		AUTH_LIBS="$AUTH_LIBS `cat $vpop_etc/lib_deps`"
 		AC_DEFINE(USERDB_VPOPMAIL,, Build with vpopmail support)
 		AC_DEFINE(PASSDB_VPOPMAIL,, Build with vpopmail support)
 		userdb="$userdb vpopmail"
@@ -2139,7 +2143,7 @@ if test $want_vpopmail != no; then
 	else
 		AC_MSG_RESULT(not found)
 		if test $want_vpopmail = yes; then
-		  AC_ERROR([Can't build with vpopmail support: $vpop_libdeps not found])
+		  AC_ERROR([Can't build with vpopmail support: $vpop_etc/lib_deps not found])
 		fi
 	fi
 fi