From 1720e4816dcd72958da31ceb8bdf8af01dc3041f Mon Sep 17 00:00:00 2001 From: nbm Date: Thu, 1 Mar 2001 13:05:47 +0000 Subject: Some fixes and tweaks from Yuri, hopefully fixing the mysql problems that have been reported to me. These changes don't affect the package, just if people use some of the WITH_* or WITHOUT_* options Submitted by: Yuri L Khachaturian --- mail/vpopmail-devel/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'mail/vpopmail-devel') diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile index f5f37ed80fca..5e4d50169e5a 100644 --- a/mail/vpopmail-devel/Makefile +++ b/mail/vpopmail-devel/Makefile @@ -50,7 +50,7 @@ CONFIGURE_ARGS= --enable-qmail-dir=${QMAIL_DIR} \ HARDQUOTA?= 10000000 RELAYCLEAR?= 30 LOGLEVEL?= y -APOPFILE?= /etc/apop-secrets +APOPFILE?= /usr/local/vpopmail/etc/apop-secrets .if exists(${LOCALBASE}/qmail/bin/qmail-send) QMAIL_DIR?= ${LOCALBASE}/qmail @@ -80,6 +80,12 @@ CONFIGURE_ARGS+= --enable-passwd=n .if defined(WITH_APOP) CONFIGURE_ARGS+= --enable-apop=y \ --enable-apop-file=${APOPFILE} +.else +CONFIGURE_ARGS+= --enable-apop=n +.endif + +.if !defined(WITH_SQWEBMAIL) +CONFIGURE_ARGS+= --enable-sqwebmail-pass=n .endif .if !defined(WITHOUT_ROAMING) @@ -89,9 +95,9 @@ CONFIGURE_ARGS+= --enable-roaming-users=y \ .if defined(WITH_MYSQL) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -CONFIGURE_ARGS+= --with-mysql=y \ - --with-sqlincdir=${LOCALBASE}/include/mysql \ - --with-sqllibdir=${LOCALBASE}/lib/mysql +CONFIGURE_ARGS+= --enable-mysql=y \ + --enable-sqlincdir=${LOCALBASE}/include/mysql \ + --enable-sqllibdir=${LOCALBASE}/lib/mysql .endif .if defined(DEFAULT_DOMAIN) -- cgit