summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2004-10-16 09:15:52 +0000
committerClement Laforet <clement@FreeBSD.org>2004-10-16 09:15:52 +0000
commit0a1a2dddcdc84e1ccbb62943bcff8595834b6625 (patch)
tree5713d73d5e9cdbff5c8b16243335324ee5c13006
parent- Security update to 2.8.20-1.3.31 (diff)
- Fix apr detection
WARNING: apache2 + apr 1.0 is BROKEN I'm working on a small compat hack. But don't dream too much. apache 2.0.x is not designed to work with apr 1.x. Forgotten by: kuriyama
Notes
Notes: svn path=/head/; revision=119575
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/apache20/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index c1c71b8cbe1e..5a3dde87d761 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -132,8 +132,8 @@ CONFIGURE_ARGS+= --with-ldap \
IGNORE= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined"
. endif
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr
-CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \
- --with-apr-util=${LOCALBASE}/bin/apu-config
+CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-1-config \
+ --with-apr-util=${LOCALBASE}/bin/apu-1-config
CONFIGURE_ENV+= LTFLAGS="--tag=CXX"
PLIST_SUB+= PORTS_APR="@comment "
.else
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index c1c71b8cbe1e..5a3dde87d761 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -132,8 +132,8 @@ CONFIGURE_ARGS+= --with-ldap \
IGNORE= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined"
. endif
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr
-CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \
- --with-apr-util=${LOCALBASE}/bin/apu-config
+CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-1-config \
+ --with-apr-util=${LOCALBASE}/bin/apu-1-config
CONFIGURE_ENV+= LTFLAGS="--tag=CXX"
PLIST_SUB+= PORTS_APR="@comment "
.else