Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8828:71f385df3de4 HEAD
--with-vpopmail=path now also checks path/lib_deps instead of only path/etc/lib_deps.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Fri, 13 Mar 2009 18:01:30 -0400 |
| parents | 601e0382b442 |
| children | f67a966f2792 |
| files | configure.in |
| diffstat | 1 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Fri Mar 13 17:46:14 2009 -0400 +++ b/configure.in Fri Mar 13 18:01:30 2009 -0400 @@ -2078,12 +2078,15 @@ 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 @@ 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