repair combination with_gd and with_pdflib

apache/apache.spec

@@ -66,7 +66,7 @@ Class:        BASE
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20040825
+Release:      20040830
 
 #   package options (suexec related)
 %option       with_suexec               yes
@@ -166,7 +166,7 @@ Release:      20040825
 %undefine     with_mod_php_gd
 %define       with_mod_php_gd           yes
 %endif
-%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" || "%{with_mod_php_gd}" == "yes" || "%{with_mod_php_dom}" == "yes"
+%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_gd}" == "yes" || "%{with_mod_php_dom}" == "yes"
 %undefine     with_mod_php_zlib
 %define       with_mod_php_zlib         yes
 %endif
@@ -254,8 +254,8 @@ BuildPreReq:  db
 PreReq:       db
 %endif
 %if "%{with_mod_php_pdflib}" == "yes"
-BuildPreReq:  pdflib, jpeg, png
-PreReq:       pdflib, jpeg, png
+BuildPreReq:  pdflib
+PreReq:       pdflib
 %endif
 %if "%{with_mod_php_zlib}" == "yes"
 BuildPreReq:  zlib
@@ -670,8 +670,10 @@ AutoReqProv:  no
       CFLAGS="$CFLAGS -DEAPI"
 %endif
 %if "%{with_mod_php_gd}" == "yes"
+%if "%{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
@@ -732,9 +734,11 @@ AutoReqProv:  no
 %endif
 %if "%{with_mod_php_gd}" == "yes"
           --with-gd=%{l_prefix} \
+%if "%{with_mod_php_pdflib}" != "yes"
           --with-jpeg-dir=%{l_prefix} \
           --with-png-dir=%{l_prefix} \
 %endif
+%endif
 %if "%{with_mod_php_freetype}" == "yes"
           --enable-gd-imgstrttf \
           --enable-gd-native-ttf \
@@ -760,8 +764,6 @@ AutoReqProv:  no
 %endif
 %if "%{with_mod_php_pdflib}" == "yes"
           --with-pdflib=%{l_prefix} \
-          --with-jpeg-dir=%{l_prefix} \
-          --with-png-dir=%{l_prefix} \
 %endif
 %if "%{with_mod_php_ssl}" == "yes" || "%{with_mod_php_openldap}" == "yes"
           --with-openssl=%{l_prefix} \

php/php.spec

@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Language
 License:      PHP
 Version:      %{V_php}
-Release:      20040825
+Release:      20040830
 
 #   package options
 %option       with_bc                   no
@@ -91,7 +91,7 @@ Release:      20040825
 %undefine     with_gd
 %define       with_gd            yes
 %endif
-%if "%{with_mysql}" == "yes" || "%{with_pdflib}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" == "yes"
+%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" == "yes"
 %undefine     with_zlib
 %define       with_zlib          yes
 %endif
@@ -128,8 +128,8 @@ BuildPreReq:  db
 PreReq:       db
 %endif
 %if "%{with_pdflib}" == "yes"
-BuildPreReq:  pdflib, jpeg, png
-PreReq:       pdflib, jpeg, png
+BuildPreReq:  pdflib
+PreReq:       pdflib
 %endif
 %if "%{with_zlib}" == "yes"
 BuildPreReq:  zlib
@@ -272,8 +272,10 @@ AutoReqProv:  no
     libs="$libs -lndbm -lgdbm"
 %endif
 %if "%{with_gd}" == "yes"
+%if "%{with_pdflib}" != "yes"
     libs="$libs -lpng -lz"
 %endif
+%endif
 %if "%{with_gettext}" == "yes"
     libs="$libs -liconv"
 %endif
@@ -327,9 +329,11 @@ AutoReqProv:  no
 %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 \
@@ -352,8 +356,6 @@ AutoReqProv:  no
 %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} \