From: ellson Date: Sun, 18 Nov 2007 11:59:12 +0000 (+0000) Subject: swig support for php5 is not available on rhel4, rhel5, fedora4 X-Git-Tag: LAST_LIBGRAPH~32^2~5002 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c86ab46fdbf75703adcbc32a9b51ddf0232419bb;p=graphviz swig support for php5 is not available on rhel4, rhel5, fedora4 --- diff --git a/configure.ac b/configure.ac index 903d39227..ddbea4c4d 100644 --- a/configure.ac +++ b/configure.ac @@ -782,7 +782,7 @@ AC_ARG_ENABLE(php, if test "x$enable_php" = "xyes"; then if test `$SWIG -help 2>&1 | $GREP -c '\-php5[[ ]]*- Generate'` = 0; then PHP= - AC_MSG_WARN([swig does not support php. The PHP packages will not be built]) + AC_MSG_WARN([swig does not support php5. The PHP packages will not be built]) else AC_CHECK_PROG(PHP,php,php) if test -d /usr/include/php5; then diff --git a/graphviz.spec.in b/graphviz.spec.in index 46bee7823..23a5bfab7 100644 --- a/graphviz.spec.in +++ b/graphviz.spec.in @@ -82,11 +82,10 @@ BuildRequires: xorg-x11-devel %if "%rhel" >= "4" # PERL is available earlier, but a suitable SWIG isn't %define PERL 1 -%define PHP 1 %define RUBY 1 %define GUILE 1 %define PYTHON 1 -BuildRequires: perl php-devel ruby ruby-devel guile-devel python-devel +BuildRequires: perl ruby-devel guile-devel python-devel %endif %if "%rhel" >= "5" %define JAVA 1 @@ -95,9 +94,10 @@ BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-d BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel %endif %if "%rhel" >= "6" +%define PHP 1 %define MYLIBGD --without-mylibgd %define GDK_PIXBUF --with-gdk-pixbuf -BuildRequires: gd gd-devel perl-devel +BuildRequires: gd gd-devel perl-devel php-devel %endif %endif @@ -119,15 +119,15 @@ BuildRequires: xorg-x11-devel %define IPSEPCOLA --with-ipsepcola %endif %if "%fedora" >= "4" -%define PHP 1 %define RUBY 1 %define GUILE 1 %define PYTHON 1 -BuildRequires: libtool-ltdl libtool-ltdl-devel php-devel ruby ruby-devel guile-devel python-devel +BuildRequires: libtool-ltdl libtool-ltdl-devel ruby ruby-devel guile-devel python-devel %endif %if "%fedora" >= "5" +%define PHP 1 %define JAVA 1 -BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel +BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel php-devel %ifnarch ppc64 %define SHARP 1 %define OCAML 1