From: Timo Sirainen <tss@iki.fi>
Date: Fri, 13 Mar 2009 22:01:30 +0000 (-0400)
Subject: --with-vpopmail=path now also checks path/lib_deps instead of only path/etc/lib_deps.
X-Git-Tag: 1.2.beta2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f03a36b35a7d492538487636d0727105ddfbf775;p=thirdparty%2Fdovecot%2Fcore.git

--with-vpopmail=path now also checks path/lib_deps instead of only path/etc/lib_deps.

--HG--
branch : HEAD
---

diff --git a/configure.in b/configure.in
index 75fae218e0..e6807d3508 100644
--- a/configure.in
+++ b/configure.in
@@ -2078,12 +2078,15 @@ if test "$found_sql_drivers" != "" || test "$want_sql" != "no"; then
 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
+		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"
@@ -2092,7 +2095,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