From 165c836518f9eedbc91e80862633ab5b8cf6aa90 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 22 Nov 2004 22:19:35 +0000
Subject: Replace USE_GCC_SHLIB with USE_LANGUAGES=c c++ and a nice big comment
 why we add c++ to the variable.

---
 www/apache/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'www/apache')

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 952e6163c40..a9ef46e12bf 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2004/11/15 15:05:34 sketch Exp $
+# $NetBSD: Makefile,v 1.157 2004/11/22 22:19:35 wiz Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -29,6 +29,10 @@ CONFLICTS=		apache-*ssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
 USE_BUILDLINK3=		YES
+# Actually, apache is only written in C, but we need this so that
+# a dlopen()ed apache module that's written in C++ will have static
+# objects constructed properly.
+USE_LANGUAGES=		c c++
 USE_PKGINSTALL=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-layout="${WRKDIR}/config.layout:pkgsrc"
@@ -126,7 +130,6 @@ MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 # ensures modules can resolve symbols they require from gcc.
 #
 .    if !empty(CC_VERSION:Mgcc-3*)
-USE_GCC_SHLIB=		YES
 LINK_LIBGCC_LDFLAGS+=	-lgcc_s
 .    endif
 .  endif
-- 
cgit v1.2.3