[packages/php] set distro default with bcond define, but allow commandline override

glen glen at pld-linux.org
Mon Jun 10 20:53:14 CEST 2013


commit 7a8b383765772f40edae837c96d346e4726ac477
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jun 10 21:52:30 2013 +0300

    set distro default with bcond define, but allow commandline override

 php.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 5a2997a..7d52d03 100644
--- a/php.spec
+++ b/php.spec
@@ -32,7 +32,7 @@
 %bcond_with	instantclient	# build Oracle oci8 extension module against oracle-instantclient package
 %bcond_with	system_gd	# with system gd (we prefer internal since it enables few more features)
 %bcond_with	system_libzip	# with system libzip (reported broken currently)
-%bcond_with	default_php	# use this PHP as default PHP in distro (distro default is set below)
+%bcond_without	default_php	# use this PHP as default PHP in distro
 %bcond_without	curl		# without CURL extension module
 %bcond_without	filter		# without filter extension module
 %bcond_without	enchant		# without Enchant extension module
@@ -113,8 +113,10 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 
 %if "%{pld_release}" == "ac"
 %define		_noautoreqdep libphp_common.*
-%else
-%define		with_default_php	1
+# if commandline --with was given. respect that
+%if 0%{!?_with_default_php:1}
+%undefine	with_default_php
+%endif
 %endif
 
 %define		rel	1
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/7a8b383765772f40edae837c96d346e4726ac477



More information about the pld-cvs-commit mailing list