summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorDirk Froemberg <dirk@FreeBSD.org>1999-01-18 15:38:00 +0000
committerDirk Froemberg <dirk@FreeBSD.org>1999-01-18 15:38:00 +0000
commitcd6e410a24a8499e65ce41269b612260cc0b836a (patch)
tree82818abfdf20a6cd90a24f9fe74f2410e72c2b57 /www
parentCorrectly refer to sam's build directory. (diff)
Don't try to find out which mysql version is installed.
Use a simple library dependency to mysql322. The "autodetection" introduces more problems than it solves. Requested by: Satoshi
Notes
Notes: svn path=/head/; revision=16183
Diffstat (limited to 'www')
-rw-r--r--www/mod_php3/scripts/configure.php4
-rw-r--r--www/mod_php4/scripts/configure.php4
-rw-r--r--www/mod_php5/scripts/configure.php4
3 files changed, 0 insertions, 12 deletions
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index 56b3b2544021..aade154c1ab3 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -59,11 +59,7 @@ while [ "$1" ]; do
echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
- echo ".if !exists(\${PREFIX}/lib/mysql/libmysqlclient.a) || exists(\${PREFIX}/lib/mysql/libmysqlclient.so)" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "LIB_DEPENDS+= mysqlclient.5:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- echo ".else" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- echo "BUILD_DEPENDS+= \${PREFIX}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- echo ".endif" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"PostgreSQL\")
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 56b3b2544021..aade154c1ab3 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -59,11 +59,7 @@ while [ "$1" ]; do
echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
- echo ".if !exists(\${PREFIX}/lib/mysql/libmysqlclient.a) || exists(\${PREFIX}/lib/mysql/libmysqlclient.so)" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "LIB_DEPENDS+= mysqlclient.5:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- echo ".else" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- echo "BUILD_DEPENDS+= \${PREFIX}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- echo ".endif" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"PostgreSQL\")
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 56b3b2544021..aade154c1ab3 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -59,11 +59,7 @@ while [ "$1" ]; do
echo "PHP3_CONF_ARGS+= --with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"MySQL\")
- echo ".if !exists(\${PREFIX}/lib/mysql/libmysqlclient.a) || exists(\${PREFIX}/lib/mysql/libmysqlclient.so)" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "LIB_DEPENDS+= mysqlclient.5:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- echo ".else" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- echo "BUILD_DEPENDS+= \${PREFIX}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql321" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
- echo ".endif" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "PHP3_CONF_ARGS+= --with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
;;
\"PostgreSQL\")