summaryrefslogtreecommitdiff
path: root/www/mod_php3
diff options
context:
space:
mode:
authorDirk Froemberg <dirk@FreeBSD.org>1999-08-26 21:18:15 +0000
committerDirk Froemberg <dirk@FreeBSD.org>1999-08-26 21:18:15 +0000
commitf1b6bb55b8f8d0d11b52d523bde720bf1d50d6f9 (patch)
treed6106aa6c90970a1e5271101d5f07a4095a669a6 /www/mod_php3
parentUpdate to version 1.4.0 (diff)
Fix two minor problems:
- if e. g. a "make BATCH=yes fetch" was followed by a "make all" the config menu popped up. - if gd was installed but gd support was not checked in the config menu, php was compiled with gd support nevertheless. (There may be other support options having the same behavior. I haven't checked all, yet.)
Notes
Notes: svn path=/head/; revision=21006
Diffstat (limited to 'www/mod_php3')
-rw-r--r--www/mod_php3/Makefile10
-rw-r--r--www/mod_php3/scripts/configure.php4
2 files changed, 9 insertions, 5 deletions
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index c8aadd70a129..40a7801757f3 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
# Date created: So 21 Jun 1998 16:09:39 CEST
# Whom: Stefan Herrmann <stefan@asterix.webaffairs.net>
#
-# $Id: Makefile,v 1.88 1999/08/22 19:00:27 mharo Exp $
+# $Id: Makefile,v 1.89 1999/08/26 09:24:16 dirk Exp $
#
DISTNAME= apache_${VERSION_APACHE}
@@ -87,7 +87,8 @@ CFLAGS+= -O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer \
.endif
CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
-SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}"
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ TOUCH="${TOUCH}"
INSTALL_TARGET= install-quiet
@@ -103,12 +104,11 @@ PHP_CONF_ARGS= --prefix=${PREFIX} \
--with-apache=${WRKSRC} \
--with-config-file-path=${PREFIX}/etc \
--disable-debug \
- --enable-track-vars
+ --enable-track-vars \
+ --without-gd
-.if !defined(BATCH)
pre-fetch:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
-.endif
post-extract:
@${LN} -s php-${VERSION_PHP} ${WRKDIR}/php
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index c7b91371b587..28f8fd526bbf 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -1,5 +1,9 @@
#!/bin/sh
+if [ "${BATCH}" ]; then
+ ${TOUCH} ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit
+fi
if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
exit
fi