From 59986246751ae9ddf2ae92b7672288388b8eed8d Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Tue, 20 Jan 2004 18:34:12 +0000
Subject: [PATCH] "Alan J. Wylie" <ebpxyvahk@wylie.me.uk>: added configure
 options to php

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2209 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/alessandro/php/config.in | 13 ++++++++-----
 package/alessandro/php/php.conf  |  4 ++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package/alessandro/php/config.in b/package/alessandro/php/config.in
index a7bf1438a..2aca84516 100644
--- a/package/alessandro/php/config.in
+++ b/package/alessandro/php/config.in
@@ -20,16 +20,19 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if pkgcheck php X
-then
+if pkgcheck php X ; then
 	menu_begin MENU_PKG_PHP 'PHP Package Options'
 		bool 'Force usage of shared modules' ROCKCFG_PKG_PHP_FORCESHARED 0
 		bool 'Build PHP with Mysql support' ROCKCFG_PKG_PHP_mysql 0
 		for xpkg in postgresql openldap openssl ; do
-			if pkgcheck $xpkg X ; then
-				bool "Build PHP with $xpkg support" ROCKCFG_PKG_PHP_$xpkg 0
-			fi
+		  if pkgcheck $xpkg X ; then
+		    bool "Build PHP with $xpkg support" ROCKCFG_PKG_PHP_$xpkg 0
+		  fi
 		done
+
+		bool "Build PHP with mcrypt support" ROCKCFG_PKG_PHP_mcrypt 0
+		bool "Build PHP with gd support"     ROCKCFG_PKG_PHP_gd 0
+
 	menu_end
 fi
 
diff --git a/package/alessandro/php/php.conf b/package/alessandro/php/php.conf
index d1d637330..8188db004 100644
--- a/package/alessandro/php/php.conf
+++ b/package/alessandro/php/php.conf
@@ -38,4 +38,8 @@ fi
 [ "$ROCKCFG_PKG_PHP_openldap" = 1 ] && var_append extraconfopt " " "--with-ldap=${pkg_openldap_prefix}"
 [ "$ROCKCFG_PKG_PHP_openssl" = 1 ] && var_append extraconfopt " " "--with-openssl"
 
+[ "$ROCKCFG_PKG_PHP_mcrypt"  = 1 ] && var_append extraconfopt " " "--with-mcrypt"
+[ "$ROCKCFG_PKG_PHP_gd"      = 1 ] && var_append extraconfopt " " "--with-gd"
+
 postmake='cp php.ini-* $docdir'
+