From c5e63d88147215f5c3ec4a703643fc57dcb00957 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Wed, 24 Jun 1998 19:54:05 +0000
Subject: Make performance tuning conditionaly depends on APACHE_PERF_TUNING
 variable. Add more optimization there.

---
 www/apache13/Makefile | 22 ++++++++++++++++------
 www/apache2/Makefile  | 22 ++++++++++++++++------
 www/apache20/Makefile | 22 ++++++++++++++++------
 www/apache21/Makefile | 22 ++++++++++++++++------
 www/apache22/Makefile | 22 ++++++++++++++++------
 5 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 75d0fc81d41c..2497dc1461c8 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.56 1998/06/18 11:51:03 ache Exp $
+# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $
 #
 
 DISTNAME=       apache_1.3.0
@@ -15,6 +15,10 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=     ache@freebsd.org
 
+#
+# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+#
+
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= \
 		 --logfiledir=/var/log \
@@ -22,16 +26,22 @@ CONFIGURE_ARGS= \
 		 --datadir=${PREFIX}/www \
 		 --proxycachedir=${PREFIX}/www/proxy \
 		 --libexecdir=${PREFIX}/libexec/apache \
-		 --disable-rule=STATUS \
 		 --enable-shared=remain \
 		 --enable-module=most \
 		 --enable-module=auth_db \
 		 --disable-module=auth_dbm
 
-CONFIGURE_ENV= \
-OPTIM='-DBUFFERED_LOGS -DHARD_SERVER_LIMIT=512 \
--DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
--DDEFAULT_PATH=\\"/bin:/usr/bin:'${PREFIX}'/bin\\"'
+OPTIM=-DHARD_SERVER_LIMIT=512 \
+-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
+.endif
+
+CONFIGURE_ENV= OPTIM='${OPTIM}'
 
 MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=   apxs.8 httpd.8 logresolve.8 rotatelogs.8
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 75d0fc81d41c..2497dc1461c8 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.56 1998/06/18 11:51:03 ache Exp $
+# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $
 #
 
 DISTNAME=       apache_1.3.0
@@ -15,6 +15,10 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=     ache@freebsd.org
 
+#
+# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+#
+
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= \
 		 --logfiledir=/var/log \
@@ -22,16 +26,22 @@ CONFIGURE_ARGS= \
 		 --datadir=${PREFIX}/www \
 		 --proxycachedir=${PREFIX}/www/proxy \
 		 --libexecdir=${PREFIX}/libexec/apache \
-		 --disable-rule=STATUS \
 		 --enable-shared=remain \
 		 --enable-module=most \
 		 --enable-module=auth_db \
 		 --disable-module=auth_dbm
 
-CONFIGURE_ENV= \
-OPTIM='-DBUFFERED_LOGS -DHARD_SERVER_LIMIT=512 \
--DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
--DDEFAULT_PATH=\\"/bin:/usr/bin:'${PREFIX}'/bin\\"'
+OPTIM=-DHARD_SERVER_LIMIT=512 \
+-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
+.endif
+
+CONFIGURE_ENV= OPTIM='${OPTIM}'
 
 MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=   apxs.8 httpd.8 logresolve.8 rotatelogs.8
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 75d0fc81d41c..2497dc1461c8 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.56 1998/06/18 11:51:03 ache Exp $
+# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $
 #
 
 DISTNAME=       apache_1.3.0
@@ -15,6 +15,10 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=     ache@freebsd.org
 
+#
+# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+#
+
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= \
 		 --logfiledir=/var/log \
@@ -22,16 +26,22 @@ CONFIGURE_ARGS= \
 		 --datadir=${PREFIX}/www \
 		 --proxycachedir=${PREFIX}/www/proxy \
 		 --libexecdir=${PREFIX}/libexec/apache \
-		 --disable-rule=STATUS \
 		 --enable-shared=remain \
 		 --enable-module=most \
 		 --enable-module=auth_db \
 		 --disable-module=auth_dbm
 
-CONFIGURE_ENV= \
-OPTIM='-DBUFFERED_LOGS -DHARD_SERVER_LIMIT=512 \
--DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
--DDEFAULT_PATH=\\"/bin:/usr/bin:'${PREFIX}'/bin\\"'
+OPTIM=-DHARD_SERVER_LIMIT=512 \
+-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
+.endif
+
+CONFIGURE_ENV= OPTIM='${OPTIM}'
 
 MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=   apxs.8 httpd.8 logresolve.8 rotatelogs.8
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 75d0fc81d41c..2497dc1461c8 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.56 1998/06/18 11:51:03 ache Exp $
+# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $
 #
 
 DISTNAME=       apache_1.3.0
@@ -15,6 +15,10 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=     ache@freebsd.org
 
+#
+# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+#
+
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= \
 		 --logfiledir=/var/log \
@@ -22,16 +26,22 @@ CONFIGURE_ARGS= \
 		 --datadir=${PREFIX}/www \
 		 --proxycachedir=${PREFIX}/www/proxy \
 		 --libexecdir=${PREFIX}/libexec/apache \
-		 --disable-rule=STATUS \
 		 --enable-shared=remain \
 		 --enable-module=most \
 		 --enable-module=auth_db \
 		 --disable-module=auth_dbm
 
-CONFIGURE_ENV= \
-OPTIM='-DBUFFERED_LOGS -DHARD_SERVER_LIMIT=512 \
--DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
--DDEFAULT_PATH=\\"/bin:/usr/bin:'${PREFIX}'/bin\\"'
+OPTIM=-DHARD_SERVER_LIMIT=512 \
+-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
+.endif
+
+CONFIGURE_ENV= OPTIM='${OPTIM}'
 
 MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=   apxs.8 httpd.8 logresolve.8 rotatelogs.8
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 75d0fc81d41c..2497dc1461c8 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.56 1998/06/18 11:51:03 ache Exp $
+# $Id: Makefile,v 1.57 1998/06/18 11:56:17 ache Exp $
 #
 
 DISTNAME=       apache_1.3.0
@@ -15,6 +15,10 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=     ache@freebsd.org
 
+#
+# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+#
+
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= \
 		 --logfiledir=/var/log \
@@ -22,16 +26,22 @@ CONFIGURE_ARGS= \
 		 --datadir=${PREFIX}/www \
 		 --proxycachedir=${PREFIX}/www/proxy \
 		 --libexecdir=${PREFIX}/libexec/apache \
-		 --disable-rule=STATUS \
 		 --enable-shared=remain \
 		 --enable-module=most \
 		 --enable-module=auth_db \
 		 --disable-module=auth_dbm
 
-CONFIGURE_ENV= \
-OPTIM='-DBUFFERED_LOGS -DHARD_SERVER_LIMIT=512 \
--DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
--DDEFAULT_PATH=\\"/bin:/usr/bin:'${PREFIX}'/bin\\"'
+OPTIM=-DHARD_SERVER_LIMIT=512 \
+-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+CONFIGURE_ARGS+= --disable-rule=STATUS
+OPTIM+= -DBUFFERED_LOGS
+CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
+.endif
+
+CONFIGURE_ENV= OPTIM='${OPTIM}'
 
 MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=   apxs.8 httpd.8 logresolve.8 rotatelogs.8
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0