summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd/Makefile.bsd-wrapper
diff options
context:
space:
mode:
authorMarc Matteo <marcm@cvs.openbsd.org>2005-05-26 01:26:48 +0000
committerMarc Matteo <marcm@cvs.openbsd.org>2005-05-26 01:26:48 +0000
commit513755e30e48604537c821bfb63e9077bb73694e (patch)
tree417f76cf7529f820180d4c98369407d6ac2bea69 /usr.sbin/httpd/Makefile.bsd-wrapper
parent80597f9bce24d6eb08516a0a0a99dbfa47b6014d (diff)
Disable the internal expat since nothing uses it and it conflicts
with ports that use other XML parsers. ok henning@ beck@
Diffstat (limited to 'usr.sbin/httpd/Makefile.bsd-wrapper')
-rw-r--r--usr.sbin/httpd/Makefile.bsd-wrapper5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index 529b862bafe..03728fcebdc 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
# Build wrapper for Apache
-# $OpenBSD: Makefile.bsd-wrapper,v 1.47 2004/06/07 04:17:13 brad Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.48 2005/05/26 01:26:47 marcm Exp $
# Our lndir is hacked; specify a full path to avoid potential conflicts
# with the one installed with X11.
@@ -45,7 +45,8 @@ CONFIG_ARGS= --with-layout="OpenBSD" --enable-module="ssl" \
--suexec-docroot="${HTTPD_HTDOCSDIR}" \
--suexec-logfile="/var/log/suexec_log" --suexec-userdir="public_html" \
--suexec-uidmin="1000" --suexec-gidmin="1000" \
- --suexec-safepath="/usr/bin:/bin:/usr/local/bin"
+ --suexec-safepath="/usr/bin:/bin:/usr/local/bin" \
+ --disable-rule=EXPAT
# This is stupid - to build a DSO module for Apache you not only need to
# --enable-shared, you need to --enable-module or --enable-shared doesn't