Date: Wed, 26 Jan 2005 11:03:52 +0100 From: Clement Laforet <clement@FreeBSD.org> To: apache@FreeBSD.org Subject: Fwd: cvs commit: ports/www/apache2 Makefile.modules.3rd Message-ID: <20050126100352.GB50248@goofy.cultdeadsheep.org>
next in thread | raw e-mail | index | archive | help
--VrqPEDrXMn8OVzN4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
FYI.
----- Forwarded message from Clement Laforet <clement@FreeBSD.org> -----
=46rom: Clement Laforet <clement@FreeBSD.org>
Date: Wed, 26 Jan 2005 10:00:11 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
cvs-all@FreeBSD.org
Subject: cvs commit: ports/www/apache2 Makefile.modules.3rd
clement 2005-01-26 10:00:11 UTC
FreeBSD ports repository
Modified files:
www/apache2 Makefile.modules.3rd=20
Log:
Changes in Makefile.modules.3rd
o Major change(s)
- in some cases, modules are still built as static modules, making
modules selection useless and generate a non-desired httpd
=20
o Minor change(s)
- apxs detection is done only if port isn't a server one.
- Mark modules ports as IGNORED if apaxhe is built statically
- fix make show-modules when when WITH_ALL_STATIC_MODULES is defined
=20
Most issues discovered by: Jason Mealins <jason_mealins@bigfix.com>
=20
Revision Changes Path
1.16 +22 -10 ports/www/apache2/Makefile.modules.3rd
http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/apache2/Makefile.modules.3r=
d.diff?&r1=3D1.15&r2=3D1.16&f=3Dh&f=3Du
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/local/www/cvsroot/FreeBSD/ports/www/apache2/Makefile.modules=
=2E3rd,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ports/www/apache2/Makefile.modules.3rd 2005/01/25 10:11:34 1.15
+++ ports/www/apache2/Makefile.modules.3rd 2005/01/26 10:00:11 1.16
@@ -1,6 +1,6 @@
# Makefile.modules.3rd
#
-# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache2/Makefile.modu=
les.3rd,v 1.15 2005/01/25 10:11:34 clement Exp $
+# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache2/Makefile.modu=
les.3rd,v 1.16 2005/01/26 10:00:11 clement Exp $
#
# Author: Clement Laforet <clement@FreeBSD.org>
# If you have questions, please contact me.
@@ -18,15 +18,6 @@ OVERRIDABLE_VARS=3D SRC_FILE MODULENAME SH
PKGNAMESUFFIX
=20
=20
-.if exists(${APXS})
-APXS_PREFIX!=3D ${APXS} -q prefix
-. if defined(AP_GENPLIST) && ${APXS_PREFIX} !=3D ${PREFIX}
-IGNORE=3D PREFIX must be egal to APXS_PREFIX.
-. endif
-.else
-APXS_PREFIX=3D ${APXS:S/\/sbin\/apxs//}
-.endif
-
.if exists(${APXS_PREFIX}/include/apache2/http_core.h)
WITH_APACHE2=3D YES
. if defined (WANT_APACHE)
@@ -59,6 +50,18 @@ IGNORE=3D "Unknown apache version"
.endif
=20
.if !defined(PORT_IS_SERVER)
+.if exists(${APXS})
+APXS_PREFIX!=3D ${APXS} -q prefix 2> /dev/null || true
+. if defined(APXS_PREFIX)
+IGNORE=3D : Your apache does not support DSO modules
+. endif
+. if defined(AP_GENPLIST) && ${APXS_PREFIX} !=3D ${PREFIX}
+IGNORE?=3D PREFIX must be egal to APXS_PREFIX.
+. endif
+.else
+APXS_PREFIX=3D ${APXS:S/\/sbin\/apxs//}
+.endif
+
.if defined(WITH_APACHE2)
AP_BUILDEXT=3D la
PLIST_SUB+=3D APACHEMODDIR=3D"libexec/apache2"
@@ -147,6 +150,14 @@ ${module}_PLIST_SUB=3D "@comment "
.if ${WANT_APACHE} =3D=3D common13
# dirty hack to make sure all modules are disabled before we select them
CONFIGURE_ARGS+=3D --disable-module=3D"all"
+.elif ${WANT_APACHE} =3D=3D common2
+CONFIGURE_ARGS+=3D --disable-access --disable-auth \
+ --disable-charset-lite --disable-include \
+ --disable-log-config --disable-env --disable-setenvif \
+ --disable-mime --disable-status --disable-autoindex \
+ --disable-asis --disable-cgid --disable-cgi \
+ --disable-negotiation --disable-dir --disable-imap \
+ --disable-actions --disable-userdir --disable-alias
.endif
=20
.if defined(WITH_MODULES)
@@ -243,6 +254,7 @@ _CONFIGURE_ARGS!=3D \
fi; done
CONFIGURE_ARGS+=3D ${_CONFIGURE_ARGS}
.elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
+WITH_STATIC_MODULES=3D ${APACHE_MODULES}
. if ${WANT_APACHE} =3D=3D common13
. for module in ${APACHE_MODULES}
CONFIGURE_ARGS+=3D --enable-module=3D${module}
----- End forwarded message -----
--VrqPEDrXMn8OVzN4
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQFB92sIsRhfjwcjuh0RAgQaAJ4gyRO57s/0WSfPbegYawFfJ80VWwCfQqfF
X7jDiJXaT8XhMXELmvc+MNY=
=m9yp
-----END PGP SIGNATURE-----
--VrqPEDrXMn8OVzN4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050126100352.GB50248>