From 845aca0b445abb0118f4416aaf9aac732812c54e Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Thu, 29 Aug 2002 14:15:22 +0000
Subject: [PATCH] fix mod_php+gd+zlib situation (inter-dependencies)

---
 apache/apache.spec | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/apache/apache.spec b/apache/apache.spec
index 3d8bd5eb50..16eccbf710 100644
--- a/apache/apache.spec
+++ b/apache/apache.spec
@@ -96,22 +96,22 @@
 exit 1
 %endif
 %if "%{with_mod_ssl}" == "yes"
-%define with_mod_php_openssl yes
-%define with_mod_php_mm      yes
-%endif
-%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes"
-%define with_mod_php_zlib    yes
+%define with_mod_php_openssl   yes
+%define with_mod_php_mm        yes
 %endif
 %if "%{with_mod_php_freetype}" == "yes"
-%define with_mod_php_gd      yes
+%define with_mod_php_gd        yes
+%endif
+%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" || "%{with_mod_php_gd}" == "yes"
+%define with_mod_php_zlib      yes
 %endif
 %endif
 %if "%{with_mod_php3}" == "yes"
 %if "%{with_mod_ssl}" == "yes"
-%define with_mod_php3_openssl yes
+%define with_mod_php3_openssl  yes
 %endif
 %if "%{with_mod_php3_mysql}" == "yes"
-%define with_mod_php3_zlib    yes
+%define with_mod_php3_zlib     yes
 %endif
 %endif
 
@@ -143,7 +143,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20020801
+Release:      20020829
 
 #   list of sources
 Source0:      http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -272,7 +272,7 @@ AutoReqProv:  no
     --define 'with_mod_perl             %{with_mod_perl}' \
     --define 'with_mod_php              %{with_mod_php}' \
     --define 'with_mod_php3             %{with_mod_php3}' \
-    --define 'with_mod_ssl              %{with_mod_ssl}'
+    --define 'with_mod_ssl              %{with_mod_ssl}' \
 
     Options (additional modules II):
     --define 'with_mod_access_referer   %{with_mod_access_referer}' \
@@ -282,7 +282,7 @@ AutoReqProv:  no
     --define 'with_mod_relocate         %{with_mod_relocate}' \
     --define 'with_mod_roaming          %{with_mod_roaming}' \
     --define 'with_mod_throttle         %{with_mod_throttle}' \
-    --define 'with_mod_zmod             %{with_mod_zmod}'
+    --define 'with_mod_zmod             %{with_mod_zmod}' \
 
     Options (additional extensions for mod_php):
     --define 'with_mod_php_bzip2        %{with_mod_php_bzip2}' \
@@ -305,7 +305,7 @@ AutoReqProv:  no
     --define 'with_mod_php_pdflib       %{with_mod_php_pdflib}' \
     --define 'with_mod_php_transsid     %{with_mod_php_transsid}' \
     --define 'with_mod_php_xml          %{with_mod_php_xml}' \
-    --define 'with_mod_php_zlib         %{with_mod_php_zlib}
+    --define 'with_mod_php_zlib         %{with_mod_php_zlib}' \
 
     Options (additional extensions for mod_php3):
     --define 'with_mod_php3_ftp         %{with_mod_php3_ftp}' \
@@ -313,7 +313,7 @@ AutoReqProv:  no
     --define 'with_mod_php3_jpeg        %{with_mod_php3_jpeg}' \
     --define 'with_mod_php3_mysql       %{with_mod_php3_mysql}' \
     --define 'with_mod_php3_openssl     %{with_mod_php3_openssl}' \
-    --define 'with_mod_php3_zlib        %{with_mod_php3_zlib}'
+    --define 'with_mod_php3_zlib        %{with_mod_php3_zlib}' \
 
 %prep
     #   unpack Apache distribution