/[gentoo-x86]/eclass/php-ext-source-r2.eclass
Gentoo

Diff of /eclass/php-ext-source-r2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.1 Revision 1.30
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.1 2010/10/06 08:25:51 olemarkus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.30 2012/09/27 16:35:41 axs Exp $
4# 4
5# @ECLASS: php-ext-source-r2.eclass
6# @MAINTAINER:
7# Gentoo PHP team <php-bugs@gentoo.org>
8# @AUTHOR:
5# Author: Tal Peer <coredumb@gentoo.org> 9# Author: Tal Peer <coredumb@gentoo.org>
6# Author: Stuart Herbert <stuart@gentoo.org> 10# Author: Stuart Herbert <stuart@gentoo.org>
7# Author: Luca Longinotti <chtekk@gentoo.org> 11# Author: Luca Longinotti <chtekk@gentoo.org>
8# Author: Jakub Moc <jakub@gentoo.org> (documentation) 12# Author: Jakub Moc <jakub@gentoo.org> (documentation)
9# Author: Ole Markus With <olemarkus@gentoo.org> 13# Author: Ole Markus With <olemarkus@gentoo.org>
10
11# @ECLASS: php-ext-source-r2.eclass
12# @MAINTAINER:
13# Gentoo PHP team <php-bugs@gentoo.org>
14# @BLURB: A unified interface for compiling and installing standalone PHP extensions. 14# @BLURB: A unified interface for compiling and installing standalone PHP extensions.
15# @DESCRIPTION: 15# @DESCRIPTION:
16# This eclass provides a unified interface for compiling and installing standalone 16# This eclass provides a unified interface for compiling and installing standalone
17# PHP extensions (modules). 17# PHP extensions (modules).
18 18
19inherit flag-o-matic autotools 19inherit flag-o-matic autotools multilib
20 20
21EXPORT_FUNCTIONS src_unpack src_configure src_compile src_install 21EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
22
23# @ECLASS-VARIABLE: PHP_EXT_NAME
24# @DESCRIPTION:
25# The extension name. This must be set, otherwise the eclass dies.
26# Only automagically set by php-ext-pecl-r1.eclass, so unless your ebuild
27# inherits that eclass, you must set this manually before inherit.
28[[ -z "${PHP_EXT_NAME}" ]] && die "No module name specified for the php-ext-source-r2 eclass"
29 22
30DEPEND=">=sys-devel/m4-1.4.3 23DEPEND=">=sys-devel/m4-1.4.3
31 >=sys-devel/libtool-1.5.18" 24 >=sys-devel/libtool-1.5.18"
32RDEPEND="" 25RDEPEND=""
33 26
34# Because of USE deps, we require at least EAPI 2 27# Because of USE deps, we require at least EAPI 2
35case ${EAPI} in 28case ${EAPI} in
36 2|3) ;; 29 2|3|4|5) ;;
37 *) 30 *)
38 die "php-ext-source-r2 is not compatible with EAPI=${EAPI}" 31 die "php-ext-source-r2 is not compatible with EAPI=${EAPI}"
39esac 32esac
40 33
41# @ECLASS-VARIABLE: PHP_EXT_NAME 34# @ECLASS-VARIABLE: PHP_EXT_NAME
58[[ -z "${PHP_EXT_ZENDEXT}" ]] && PHP_EXT_ZENDEXT="no" 51[[ -z "${PHP_EXT_ZENDEXT}" ]] && PHP_EXT_ZENDEXT="no"
59 52
60# @ECLASS-VARIABLE: USE_PHP 53# @ECLASS-VARIABLE: USE_PHP
61# @DESCRIPTION: 54# @DESCRIPTION:
62# Lists the PHP slots compatibile the extension is compatibile with 55# Lists the PHP slots compatibile the extension is compatibile with
63[[ -z "$USE_PHP" ]] && USE_PHP="php5-2 php5-3" 56[[ -z "${USE_PHP}" ]] && USE_PHP="php5-3"
64 57
65for target in $USE_PHP; do 58# @ECLASS-VARIABLE: PHP_EXT_OPTIONAL_USE
66 IUSE="${IUSE} php_targets_$target" 59# @DESCRIPTION:
67done 60# If set, this is the USE flag that the PHP dependencies are behind
61# Most commonly set as PHP_EXT_OPTIONAL_USE=php to get the dependencies behind
62# USE=php.
63
64# @ECLASS-VARIABLE: PHP_EXT_S
65# @DESCRIPTION:
66# The relative location of the temporary build directory for the PHP extension within
67# the source package. This is useful for packages that bundle the PHP extension.
68# Defaults to ${S}
69[[ -z "${PHP_EXT_S}" ]] && PHP_EXT_S="${S}"
68 70
69#Make sure at least one target is installed. Abuses USE dependencies. 71#Make sure at least one target is installed. Abuses USE dependencies.
70for target in $USE_PHP; do 72for target in ${USE_PHP}; do
73 IUSE="${IUSE} php_targets_${target}"
71 target=${target/+} 74 target=${target/+}
72 SELFDEPEND="$SELFDEPEND =$CATEGORY/$PF[php_targets_$target]" 75 SELFDEPEND="${SELFDEPEND} =${CATEGORY}/${PF}[php_targets_${target}]"
73 slot=${target/php} 76 slot=${target/php}
74 slot=${slot/-/.} 77 slot=${slot/-/.}
78 PHPDEPEND="${PHPDEPEND}
75 PHPDEPEND="$PHPDEPEND php_target_$target? ( dev-lang/php:${slot} )" 79 php_targets_${target}? ( dev-lang/php:${slot} )"
76done 80done
77 81
78RDEPEND="${RDEPEND} 82RDEPEND="${RDEPEND}
83 ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
79 || ( $SELFDEPEND ) 84 || ( ${SELFDEPEND} )
80 $PHPDEPEND" 85 ${PHPDEPEND}
86 ${PHP_EXT_OPTIONAL_USE:+ )}"
81 87
88DEPEND="${DEPEND}
89 ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
90 ${PHPDEPEND}
91 ${PHP_EXT_OPTIONAL_USE:+ )}
92"
82 93
83# @FUNCTION: php-ext-source-r2_src_unpack 94# @FUNCTION: php-ext-source-r2_src_unpack
84# @DESCRIPTION: 95# @DESCRIPTION:
85# runs standard src_unpack + _phpize 96# runs standard src_unpack + _phpize
86# 97
87# @VARIABLE: PHP_EXT_SKIP_PHPIZE 98# @VARIABLE: PHP_EXT_SKIP_PHPIZE
88# @DESCRIPTION: 99# @DESCRIPTION:
89# phpize will be run by default for all ebuilds that use 100# phpize will be run by default for all ebuilds that use
90# php-ext-source-r1_src_unpack 101# php-ext-source-r2_src_unpack
91# Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize. 102# Set PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run phpize.
92php-ext-source-r2_src_unpack() { 103php-ext-source-r2_src_unpack() {
93 unpack ${A} 104 unpack ${A}
94 local slot orig_s="$S" 105 local slot orig_s="${PHP_EXT_S}"
95 for slot in $(php_get_slots); do 106 for slot in $(php_get_slots); do
96 cp -r "$orig_s" "${WORKDIR}/$slot" 107 cp -r "${orig_s}" "${WORKDIR}/${slot}" || die "Failed to copy source ${orig_s} to PHP target directory"
108 done
109}
110
111php-ext-source-r2_src_prepare() {
112 local slot orig_s="${PHP_EXT_S}"
113 for slot in $(php_get_slots); do
97 php_init_slot_env $slot 114 php_init_slot_env ${slot}
98 if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
99 php-ext-source-r2_phpize 115 php-ext-source-r2_phpize
100 fi
101 done 116 done
102} 117}
103 118
104# @FUNCTION php-ext-source-r2_phpize 119# @FUNCTION: php-ext-source-r2_phpize
105# @DESCRIPTION: 120# @DESCRIPTION:
106# Runs phpize and autotools in addition to the standard src_unpack 121# Runs phpize and autotools in addition to the standard src_unpack
107php-ext-source-r2_phpize() { 122php-ext-source-r2_phpize() {
123 if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then
108 # Create configure out of config.m4 124 # Create configure out of config.m4
109 # I wish I could run this to solve #329071, but I cannot 125 # I wish I could run this to solve #329071, but I cannot
110 #autotools_run_tool ${PHPIZE} 126 #autotools_run_tool ${PHPIZE}
111 ${PHPIZE} 127 ${PHPIZE}
112 # force run of libtoolize and regeneration of related autotools 128 # force run of libtoolize and regeneration of related autotools
113 # files (bug 220519) 129 # files (bug 220519)
114 rm aclocal.m4 130 rm aclocal.m4
115 eautoreconf 131 eautoreconf
132 fi
116} 133}
117 134
118# @FUNCTION: php-ext-source-r2_src_configure 135# @FUNCTION: php-ext-source-r2_src_configure
119# @DESCRIPTION: 136# @DESCRIPTION:
120# Takes care of standard configure for PHP extensions (modules). 137# Takes care of standard configure for PHP extensions (modules).
121# 138
122# @VARIABLE: my_conf 139# @VARIABLE: my_conf
123# @DESCRIPTION: 140# @DESCRIPTION:
124# Set this in the ebuild to pass configure options to econf. 141# Set this in the ebuild to pass configure options to econf.
125php-ext-source-r2_src_configure() { 142php-ext-source-r2_src_configure() {
143 # net-snmp creates this file #385403
144 addpredict /usr/share/snmp/mibs/.index
145 addpredict /var/lib/net-snmp/mib_indexes
146
126 local slot 147 local slot
127 for slot in $(php_get_slots); do 148 for slot in $(php_get_slots); do
128 php_init_slot_env $slot 149 php_init_slot_env ${slot}
129 # Set the correct config options 150 # Set the correct config options
130 # We cannot use econf here, phpize/php-config deals with setting
131 # --prefix etc to whatever the php slot was configured to use
132 ./configure --with-php-config=${PHPCONFIG} ${my_conf} || die "Unable to configure code to compile" 151 econf --with-php-config=${PHPCONFIG} ${my_conf} || die "Unable to configure code to compile"
133 done 152 done
134} 153}
135 154
136# @FUNCTION: php-ext-source-r2_src_compile 155# @FUNCTION: php-ext-source-r2_src_compile
137# @DESCRIPTION: 156# @DESCRIPTION:
138# Takes care of standard compile for PHP extensions (modules). 157# Takes care of standard compile for PHP extensions (modules).
139php-ext-source-r2_src_compile() { 158php-ext-source-r2_src_compile() {
140 # net-snmp creates this file #324739 159 # net-snmp creates this file #324739
141 addpredict /usr/share/snmp/mibs/.index 160 addpredict /usr/share/snmp/mibs/.index
161 addpredict /var/lib/net-snmp/mib_indexes
162
142 # shm extension createss a semaphore file #173574 163 # shm extension createss a semaphore file #173574
143 addpredict /session_mm_cli0.sem 164 addpredict /session_mm_cli0.sem
144 local slot 165 local slot
145 for slot in $(php_get_slots); do 166 for slot in $(php_get_slots); do
146 php_init_slot_env $slot 167 php_init_slot_env ${slot}
147 emake || die "Unable to make code" 168 emake || die "Unable to make code"
148 169
149 done 170 done
150} 171}
151 172
152# @FUNCTION: php-ext-source-r1_src_install 173# @FUNCTION: php-ext-source-r2_src_install
153# @DESCRIPTION: 174# @DESCRIPTION:
154# Takes care of standard install for PHP extensions (modules). 175# Takes care of standard install for PHP extensions (modules).
155 176
156# @VARIABLE: DOCS 177# @VARIABLE: DOCS
157# @DESCRIPTION: 178# @DESCRIPTION:
158# Set in ebuild if you wish to install additional, package-specific documentation. 179# Set in ebuild if you wish to install additional, package-specific documentation.
159php-ext-source-r2_src_install() { 180php-ext-source-r2_src_install() {
160 local slot 181 local slot
161 for slot in $(php_get_slots); do 182 for slot in $(php_get_slots); do
162 php_init_slot_env $slot 183 php_init_slot_env ${slot}
163 184
164 # Let's put the default module away 185 # Let's put the default module away
165 insinto "${EXT_DIR}" 186 insinto "${EXT_DIR}"
166 newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension" 187 newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
167 188
189 local doc
168 for doc in ${DOCS} ; do 190 for doc in ${DOCS} ; do
169 [[ -s ${doc} ]] && dodoc ${doc} 191 [[ -s ${doc} ]] && dodoc ${doc}
170 done 192 done
171 193
194 INSTALL_ROOT="${D}" emake install-headers
172 done 195 done
173 php-ext-source-r2_createinifiles 196 php-ext-source-r2_createinifiles
174} 197}
175 198
176 199
177php_get_slots() { 200php_get_slots() {
178 local s
179 local slot 201 local s slot
180 for slot in $USE_PHP; do 202 for slot in ${USE_PHP}; do
181 use php_targets_$slot && s+=" ${slot/-/.}" 203 use php_targets_${slot} && s+=" ${slot/-/.}"
182 done 204 done
183 echo $s 205 echo $s
184} 206}
185 207
186php_init_slot_env() { 208php_init_slot_env() {
187 libdir=$(get_libdir) 209 libdir=$(get_libdir)
188 210
189 PHPIZE="/usr/${libdir}/$1/bin/phpize" 211 PHPIZE="/usr/${libdir}/${1}/bin/phpize"
190 PHPCONFIG="/usr/${libdir}/$1/bin/php-config" 212 PHPCONFIG="/usr/${libdir}/${1}/bin/php-config"
191 PHPCLI="/usr/${libdir}/$1/bin/php" 213 PHPCLI="/usr/${libdir}/${1}/bin/php"
192 PHPCGI="/usr/${libdir}/$1/bin/php-cgi" 214 PHPCGI="/usr/${libdir}/${1}/bin/php-cgi"
193 PHP_PKG="$(best_version =dev-lang/php-${1:3}*)" 215 PHP_PKG="$(best_version =dev-lang/php-${1:3}*)"
194 PHPPREFIX="/usr/${libdir}/$slot" 216 PHPPREFIX="/usr/${libdir}/${slot}"
195 EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)" 217 EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
218 PHP_CURRENTSLOT=${1:3}
196 219
197 S="${WORKDIR}/$1" 220 PHP_EXT_S="${WORKDIR}/${1}"
198 cd $S 221 cd "${PHP_EXT_S}"
199} 222}
200 223
201php-ext-source-r2_buildinilist() { 224php-ext-source-r2_buildinilist() {
202 # Work out the list of <ext>.ini files to edit/add to 225 # Work out the list of <ext>.ini files to edit/add to
203 if [[ -z "${PHPSAPILIST}" ]] ; then 226 if [[ -z "${PHPSAPILIST}" ]] ; then
204 PHPSAPILIST="apache2 cli cgi fpm" 227 PHPSAPILIST="apache2 cli cgi fpm embed"
205 fi 228 fi
206 229
207 PHPINIFILELIST="" 230 PHPINIFILELIST=""
208 231 local x
209 for x in ${PHPSAPILIST} ; do 232 for x in ${PHPSAPILIST} ; do
210 if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then 233 if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then
211 PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini" 234 PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini"
212 fi 235 fi
213 done 236 done
237 PHPFULLINIFILELIST="${PHPFULLINIFILELIST} ${PHPINIFILELIST}"
214} 238}
215 239
216# @FUNCTION: php-ext-source-r2_createinifiles 240# @FUNCTION: php-ext-source-r2_createinifiles
217# @DESCRIPTION: 241# @DESCRIPTION:
218# Builds ini files for every enabled slot and SAPI 242# Builds ini files for every enabled slot and SAPI
219php-ext-source-r2_createinifiles() { 243php-ext-source-r2_createinifiles() {
220 local slot 244 local slot
221 for slot in $(php_get_slots); do 245 for slot in $(php_get_slots); do
222 php_init_slot_env $slot 246 php_init_slot_env ${slot}
223 # Pull in the PHP settings 247 # Pull in the PHP settings
224 248
225 # Build the list of <ext>.ini files to edit/add to 249 # Build the list of <ext>.ini files to edit/add to
226 php-ext-source-r2_buildinilist $slot 250 php-ext-source-r2_buildinilist ${slot}
251
227 252
228 # Add the needed lines to the <ext>.ini files 253 # Add the needed lines to the <ext>.ini files
254 local file
229 if [[ "${PHP_EXT_INI}" = "yes" ]] ; then 255 if [[ "${PHP_EXT_INI}" = "yes" ]] ; then
256 for file in ${PHPINIFILELIST}; do
230 php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" 257 php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" "${file}"
258 done
231 fi 259 fi
232 260
233 # Symlink the <ext>.ini files from ext/ to ext-active/ 261 # Symlink the <ext>.ini files from ext/ to ext-active/
262 local inifile
234 for inifile in ${PHPINIFILELIST} ; do 263 for inifile in ${PHPINIFILELIST} ; do
264 if [[ -n "${PHP_EXT_INIFILE}" ]]; then
265 cat "${FILESDIR}/${PHP_EXT_INIFILE}" > "${inifile}"
266 einfo "Added content of ${FILESDIR}/${PHP_EXT_INIFILE} to ${inifile}"
267 fi
268
269
270
271
235 inidir="${inifile/${PHP_EXT_NAME}.ini/}" 272 inidir="${inifile/${PHP_EXT_NAME}.ini/}"
236 inidir="${inidir/ext/ext-active}" 273 inidir="${inidir/ext/ext-active}"
237 dodir "/${inidir}" 274 dodir "/${inidir}"
238 dosym "/${inifile}" "/${inifile/ext/ext-active}" 275 dosym "/${inifile}" "/${inifile/ext/ext-active}"
239 done 276 done
245 282
246php-ext-source-r2_addextension() { 283php-ext-source-r2_addextension() {
247 if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then 284 if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then
248 # We need the full path for ZendEngine extensions 285 # We need the full path for ZendEngine extensions
249 # and we need to check for debugging enabled! 286 # and we need to check for debugging enabled!
250 if has_zts ; then 287 if has_version "dev-lang/php:${PHP_CURRENTSLOT}[threads]" ; then
251 if has_debug ; then 288 if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]" ; then
252 ext_type="zend_extension_debug_ts" 289 ext_type="zend_extension_debug_ts"
253 else 290 else
254 ext_type="zend_extension_ts" 291 ext_type="zend_extension_ts"
255 fi 292 fi
256 ext_file="${EXT_DIR}/$1" 293 ext_file="${EXT_DIR}/${1}"
257 else 294 else
258 if has_debug ; then 295 if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]"; then
259 ext_type="zend_extension_debug" 296 ext_type="zend_extension_debug"
260 else 297 else
261 ext_type="zend_extension" 298 ext_type="zend_extension"
262 fi 299 fi
263 ext_file="${EXT_DIR}/$1" 300 ext_file="${EXT_DIR}/${1}"
264 fi 301 fi
265 302
266 # php-5.3 unifies zend_extension loading and just requires the 303 # php-5.3 unifies zend_extension loading and just requires the
267 # zend_extension keyword with no suffix 304 # zend_extension keyword with no suffix
268 # TODO: drop previous code and this check once <php-5.3 support is 305 # TODO: drop previous code and this check once <php-5.3 support is
271 ext_type="zend_extension" 308 ext_type="zend_extension"
272 fi 309 fi
273 else 310 else
274 # We don't need the full path for normal extensions! 311 # We don't need the full path for normal extensions!
275 ext_type="extension" 312 ext_type="extension"
276 ext_file="$1" 313 ext_file="${1}"
277 fi 314 fi
278 315
279 php-ext-source-r2_addtoinifiles "${ext_type}" "${ext_file}" "Extension added" 316 php-ext-source-r2_addtoinifile "${ext_type}" "${ext_file}" "${2}" "Extension added"
280} 317}
281 318
282# $1 - Setting name 319# $1 - Setting name
283# $2 - Setting value 320# $2 - Setting value
284# $3 - File to add to 321# $3 - File to add to
285# $4 - Sanitized text to output 322# $4 - Sanitized text to output
286php-ext-source-r2_addtoinifile() { 323php-ext-source-r2_addtoinifile() {
324 local inifile="${WORKDIR}/${3}"
287 if [[ ! -d $(dirname $3) ]] ; then 325 if [[ ! -d $(dirname ${inifile}) ]] ; then
288 mkdir -p $(dirname $3) 326 mkdir -p $(dirname ${inifile})
289 fi 327 fi
290 328
291 # Are we adding the name of a section? 329 # Are we adding the name of a section?
292 if [[ ${1:0:1} == "[" ]] ; then 330 if [[ ${1:0:1} == "[" ]] ; then
293 echo "$1" >> "$3" 331 echo "${1}" >> "${inifile}"
294 my_added="$1" 332 my_added="${1}"
295 else 333 else
296 echo "$1=$2" >> "$3" 334 echo "${1}=${2}" >> "${inifile}"
297 my_added="$1=$2" 335 my_added="${1}=${2}"
298 fi 336 fi
299 337
300 if [[ -z "$4" ]] ; then 338 if [[ -z "${4}" ]] ; then
301 einfo "Added '$my_added' to /$3" 339 einfo "Added '${my_added}' to /${3}"
302 else 340 else
303 einfo "$4 to /$3" 341 einfo "${4} to /${3}"
304 fi 342 fi
305 343
306 insinto /$(dirname $3) 344 insinto /$(dirname ${3})
307 doins "$3" 345 doins "${inifile}"
308} 346}
309 347
310# @FUNCTION: php-ext-source-r2_addtoinifiles 348# @FUNCTION: php-ext-source-r2_addtoinifiles
311# @USAGE: <setting name> <setting value> [message to output]; or just [section name] 349# @USAGE: <setting name> <setting value> [message to output]; or just [section name]
312# @DESCRIPTION: 350# @DESCRIPTION:
325# php-ext-source-r2_addtoinifiles "[Debugger]" 363# php-ext-source-r2_addtoinifiles "[Debugger]"
326# php-ext-source-r2_addtoinifiles "debugger.enabled" "on" 364# php-ext-source-r2_addtoinifiles "debugger.enabled" "on"
327# php-ext-source-r2_addtoinifiles "debugger.profiler_enabled" "on" 365# php-ext-source-r2_addtoinifiles "debugger.profiler_enabled" "on"
328# @CODE 366# @CODE
329php-ext-source-r2_addtoinifiles() { 367php-ext-source-r2_addtoinifiles() {
368 local x
330 for x in ${PHPINIFILELIST} ; do 369 for x in ${PHPFULLINIFILELIST} ; do
331 php-ext-source-r2_addtoinifile "$1" "$2" "$x" "$3" 370 php-ext-source-r2_addtoinifile "${1}" "${2}" "${x}" "${3}"
332 done 371 done
333} 372}

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.30

  ViewVC Help
Powered by ViewVC 1.1.20