OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Aug-2004 12:52:04
Branch: HEAD Handle: 2004083111520400
Modified files:
openpkg-src/apache apache.spec
Log:
simplify condition syntax
Summary:
Revision Changes Path
1.255 +2 -4 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.254 -r1.255 apache.spec
--- openpkg-src/apache/apache.spec 30 Aug 2004 17:21:42 -0000 1.254
+++ openpkg-src/apache/apache.spec 31 Aug 2004 10:52:04 -0000 1.255
@@ -66,7 +66,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040830
+Release: 20040831
# package options (suexec related)
%option with_suexec yes
@@ -669,11 +669,9 @@
%if "%{with_mod_ssl}" == "yes"
CFLAGS="$CFLAGS -DEAPI"
%endif
-%if "%{with_mod_php_gd}" == "yes"
-%if "%{with_mod_php_pdflib}" != "yes"
+%if "%{with_mod_php_gd}" == "yes" && "%{with_mod_php_pdflib}" != "yes"
LIBS="$LIBS -lpng -lz"
%endif
-%endif
%if "%{with_mod_php_gettext}" == "yes" || "%{with_mod_php_mssql}" == "yes"
LIBS="$LIBS -liconv"
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
