OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Mar-2005 09:28:21
Branch: HEAD Handle: 2005030108282000
Modified files:
openpkg-src/php php.spec
Log:
synchronize gd/pdflib support with 'apache' package
Summary:
Revision Changes Path
1.104 +7 -7 openpkg-src/php/php.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.103 -r1.104 php.spec
--- openpkg-src/php/php.spec 6 Feb 2005 13:41:53 -0000 1.103
+++ openpkg-src/php/php.spec 1 Mar 2005 08:28:20 -0000 1.104
@@ -38,7 +38,7 @@
Group: Language
License: PHP
Version: %{V_php}
-Release: 20050206
+Release: 20050301
# package options
%option with_bc no
@@ -91,7 +91,7 @@
%undefine with_gd
%define with_gd yes
%endif
-%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes"
+%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_pdflib}" ==
"yes" || "%{with_dom}" == "yes"
%undefine with_zlib
%define with_zlib yes
%endif
@@ -128,8 +128,8 @@
PreReq: db
%endif
%if "%{with_pdflib}" == "yes"
-BuildPreReq: pdflib
-PreReq: pdflib
+BuildPreReq: pdflib, jpeg, png
+PreReq: pdflib, jpeg, png
%endif
%if "%{with_zlib}" == "yes"
BuildPreReq: zlib
@@ -272,7 +272,7 @@
%if "%{with_gdbm}" == "yes"
libs="$libs -lndbm -lgdbm"
%endif
-%if "%{with_gd}" == "yes" && "%{with_pdflib}" != "yes"
+%if "%{with_gd}" == "yes" || "%{with_pdflib}" == "yes"
libs="$libs -lpng -lz"
%endif
%if "%{with_gettext}" == "yes"
@@ -328,11 +328,9 @@
%endif
%if "%{with_gd}" == "yes"
--with-gd=%{l_prefix} \
-%if "%{with_pdflib}" != "yes"
--with-jpeg-dir=%{l_prefix} \
--with-png-dir=%{l_prefix} \
%endif
-%endif
%if "%{with_freetype}" == "yes"
--enable-gd-imgstrttf \
--enable-gd-native-ttf \
@@ -355,6 +353,8 @@
%endif
%if "%{with_pdflib}" == "yes"
--with-pdflib=%{l_prefix} \
+ --with-jpeg-dir=%{l_prefix} \
+ --with-png-dir=%{l_prefix} \
%endif
%if "%{with_ssl}" == "yes" || "%{with_openldap}" == "yes"
--with-openssl=%{l_prefix} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
