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 <yukh@ns.otradnoe.net>
This commit is contained in:
Neil Blakey-Milner 2001-03-01 13:05:47 +00:00
parent d8cb00b627
commit 4c8ae3e193
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=38933
3 changed files with 30 additions and 12 deletions

View file

@ -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)

View file

@ -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)

View file

@ -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)