PSARC 2007/000

Addendum 1:	PHP5 Integration Directory and File Structure.

1.	The following directory and file structure is proposed for PHP5:

	/usr/php5/bin/ -> /usr/php5/[version]/bin/
		php
		phpize
		php-config

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/Zend/FlexLexer.h
		php/Zend/acconfig.h
		php/Zend/zend.h
		php/Zend/zend_API.h
		php/Zend/zend_alloc.h
		php/Zend/zend_builtin_functions.h
		php/Zend/zend_compile.h
		php/Zend/zend_config.h
		php/Zend/zend_config.nw.h
		php/Zend/zend_config.w32.h
		php/Zend/zend_constants.h
		php/Zend/zend_dynamic_array.h
		php/Zend/zend_errors.h
		php/Zend/zend_exceptions.h
		php/Zend/zend_execute.h
		php/Zend/zend_extensions.h
		php/Zend/zend_fast_cache.h
		php/Zend/zend_globals.h
		php/Zend/zend_globals_macros.h
		php/Zend/zend_hash.h
		php/Zend/zend_highlight.h
		php/Zend/zend_indent.h
		php/Zend/zend_ini.h
		php/Zend/zend_ini_parser.h
		php/Zend/zend_ini_scanner.h
		php/Zend/zend_interfaces.h
		php/Zend/zend_istdiostream.h
		php/Zend/zend_iterators.h
		php/Zend/zend_language_parser.h
		php/Zend/zend_language_scanner.h
		php/Zend/zend_list.h
		php/Zend/zend_llist.h
		php/Zend/zend_mm.h
		php/Zend/zend_modules.h
		php/Zend/zend_multibyte.h
		php/Zend/zend_multiply.h
		php/Zend/zend_object_handlers.h
		php/Zend/zend_objects.h
		php/Zend/zend_objects_API.h
		php/Zend/zend_operators.h
		php/Zend/zend_ptr_stack.h
		php/Zend/zend_qsort.h
		php/Zend/zend_stack.h
		php/Zend/zend_static_allocator.h
		php/Zend/zend_stream.h
		php/Zend/zend_strtod.h
		php/Zend/zend_ts_hash.h
		php/Zend/zend_types.h
		php/Zend/zend_variables.h
		php/Zend/zend_vm.h
		php/Zend/zend_vm_def.h
		php/Zend/zend_vm_execute.h
		php/Zend/zend_vm_opcodes.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/TSRM/TSRM.h
		php/TSRM/acconfig.h
		php/TSRM/readdir.h
		php/TSRM/tsrm_config.h
		php/TSRM/tsrm_config.w32.h
		php/TSRM/tsrm_config_common.h
		php/TSRM/tsrm_nw.h
		php/TSRM/tsrm_strtok_r.h
		php/TSRM/tsrm_virtual_cwd.h
		php/TSRM/tsrm_win32.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/date/
		php/ext/date/php_date.h
		php/ext/date/lib/timelib.h
		php/ext/date/lib/timelib_config.h
		php/ext/date/lib/timelib_structs.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/dom/
		php/ext/dom/xml_common.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/gd/
		php/ext/gd/php_gd.h
		php/ext/gd/gdttf.h
		php/ext/gd/gdcache.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/hash/
		php/ext/hash/php_hash.h
		php/ext/hash/php_hash_adler32.h
		php/ext/hash/php_hash_crc32.h
		php/ext/hash/php_hash_gost.h
		php/ext/hash/php_hash_haval.h
		php/ext/hash/php_hash_md.h
		php/ext/hash/php_hash_ripemd.h
		php/ext/hash/php_hash_sha.h
		php/ext/hash/php_hash_snefru.h
		php/ext/hash/php_hash_tiger.h
		php/ext/hash/php_hash_types.h
		php/ext/hash/php_hash_whirlpool.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/iconv/
		php/ext/iconv/php_have_bsd_iconv.h
		php/ext/iconv/php_have_glibc_iconv.h
		php/ext/iconv/php_have_iconv.h
		php/ext/iconv/php_have_libiconv.h
		php/ext/iconv/php_iconv.h
		php/ext/iconv/php_iconv_supports_errno.h
		php/ext/iconv/php_php_iconv_h_path.h
		php/ext/iconv/php_php_iconv_impl.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/libxml/php_libxml.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/mbstring/
		php/ext/mbstring/mbstring.h
		php/ext/mbstring/php_mbregex.h
		php/ext/mbstring/libmbfl/
		php/ext/mbstring/libmbfl/config.h
		php/ext/mbstring/libmbfl/mbfl/
		php/ext/mbstring/libmbfl/mbfl/eaw_table.h
		php/ext/mbstring/libmbfl/mbfl/mbfilter.h
		php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
		php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
		php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_language.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
		php/ext/mbstring/libmbfl/mbfl/mbfl_string.h
		php/ext/mbstring/oniguruma/
		php/ext/mbstring/oniguruma/oniguruma.h
		php/ext/mbstring/oniguruma/php_onig_compat.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/pdo/
		php/ext/pdo/php_pdo.h
		php/ext/pdo/php_pdo_driver.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/session/
		php/ext/session/mod_files.h
		php/ext/session/mod_user.h
		php/ext/session/php_session.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/standard/
		php/ext/standard/base64.h
		php/ext/standard/basic_functions.h
		php/ext/standard/crc32.h
		php/ext/standard/credits.h
		php/ext/standard/credits_ext.h
		php/ext/standard/credits_sapi.h
		php/ext/standard/css.h
		php/ext/standard/cyr_convert.h
		php/ext/standard/datetime.h
		php/ext/standard/dl.h
		php/ext/standard/dns.h
		php/ext/standard/exec.h
		php/ext/standard/file.h
		php/ext/standard/flock_compat.h
		php/ext/standard/fsock.h
		php/ext/standard/head.h
		php/ext/standard/html.h
		php/ext/standard/info.h
		php/ext/standard/md5.h
		php/ext/standard/microtime.h
		php/ext/standard/pack.h
		php/ext/standard/pageinfo.h
		php/ext/standard/php_array.h
		php/ext/standard/php_assert.h
		php/ext/standard/php_browscap.h
		php/ext/standard/php_crypt.h
		php/ext/standard/php_dir.h
		php/ext/standard/php_ext_syslog.h
		php/ext/standard/php_filestat.h
		php/ext/standard/php_fopen_wrappers.h
		php/ext/standard/php_ftok.h
		php/ext/standard/php_http.h
		php/ext/standard/php_image.h
		php/ext/standard/php_incomplete_class.h
		php/ext/standard/php_iptc.h
		php/ext/standard/php_lcg.h
		php/ext/standard/php_link.h
		php/ext/standard/php_mail.h
		php/ext/standard/php_math.h
		php/ext/standard/php_metaphone.h
		php/ext/standard/php_rand.h
		php/ext/standard/php_smart_str.h
		php/ext/standard/php_smart_str_public.h
		php/ext/standard/php_standard.h
		php/ext/standard/php_string.h
		php/ext/standard/php_type.h
		php/ext/standard/php_uuencode.h
		php/ext/standard/php_var.h
		php/ext/standard/php_versioning.h
		php/ext/standard/proc_open.h
		php/ext/standard/quot_print.h
		php/ext/standard/reg.h
		php/ext/standard/scanf.h
		php/ext/standard/sha1.h
		php/ext/standard/streamsfuncs.h
		php/ext/standard/uniqid.h
		php/ext/standard/url.h
		php/ext/standard/url_scanner.h
		php/ext/standard/url_scanner_ex.h

	/usr/php5/include/ -> /usr/php5/[version]/include/
		php/ext/xml/
		php/ext/xml/expat_compat.h
		php/ext/xml/php_xml.h

	/usr/gnu/php5/include/ -> /usr/php5/[version]/include/
		php/
		php/main/
		php/main/API.h
		php/main/build-defs.h
		php/main/config.w32.h
		php/main/fopen_wrappers.h
		php/main/logos.h
		php/main/php.h
		php/main/php3_compat.h
		php/main/php_compat.h
		php/main/php_config.h
		php/main/php_content_types.h
		php/main/php_globals.h
		php/main/php_ini.h
		php/main/php_logos.h
		php/main/php_main.h
		php/main/php_memory_streams.h
		php/main/php_network.h
		php/main/php_open_temporary_file.h
		php/main/php_output.h
		php/main/php_reentrancy.h
		php/main/php_regex.h
		php/main/php_scandir.h
		php/main/php_streams.h
		php/main/php_syslog.h
		php/main/php_ticks.h
		php/main/php_variables.h
		php/main/php_version.h
		php/main/rfc1867.h
		php/main/safe_mode.h
		php/main/snprintf.h
		php/main/spprintf.h
		php/main/win95nt.h
		php/main/streams/
		php/main/streams/php_stream_context.h
		php/main/streams/php_stream_filter_api.h
		php/main/streams/php_stream_mmap.h
		php/main/streams/php_stream_plain_wrapper.h
		php/main/streams/php_stream_transport.h
		php/main/streams/php_stream_userspace.h
		php/main/streams/php_streams_int.h

	/usr/gnu/php5/include/ -> /usr/php5/[version]/include/
		php/regex/cclass.h
		php/regex/cname.h
		php/regex/regex.h
		php/regex/regex2.h
		php/regex/regex_extra.h
		php/regex/utils.h

	/usr/gnu/php5/include/ -> /usr/php5/[version]/include/
		php/sapi/embed/
		php/sapi/embed/php_embed.h

	/usr/php5/lib/ -> /usr/php5/[version]/lib/
		libphp5.so
		build/
		build/Makefile.global
		build/acinclude.m4
		build/config.guess
		build/config.sub
		build/libtool.m4
		build/ltmain.sh
		build/mkdep.awk
		build/phpize.m4
		build/run-tests.php
		build/scan_makefile_in.awk
		build/shtool
	
	/usr/php5/man/ -> /usr/php5/[version]/man/
		man1/
		man1/php-config.1
		man1/php.1
		man1/phpize.1

	/usr/php5/modules/ -> /usr/php5/[version]/modules/
		apc.so
		bcmath.so
		bz2.so
		calendar.so
		ctype.so
		curl.so
		dbase.so
		dom.so
		dtrace.so
		exif.so
		filter.so
		ftp.so
		gd.so
		gettext.so
		hash.so
		iconv.so
		json.so
		ldap.so
		libxml.so
		mbstring.so
		openssl.so
		pcntl.so
		pcre.so
		pdo.so
		pdo_pgsql.so
		pgsql.so
		posix.so
		session.so
		shmop.so
		simplexml.so
		soap.so
		sockets.so
		spl.so
		suhosin.so
		sysvmsg.so
		sysvsem.so
		sysvshm.so
		tcpwrap.so
		tidy.so
		tokenizer.so
		wddx.so
		xml.so
		xmlreader.so
		xmlrpc.so
		xmlwriter.so
		xsl.so
		zip.so
		zlib.so

	/usr/php5/share/ -> /usr/php5/[version]/share/

	/usr/bin/php -> /usr/php5/[version]/bin/php
	/usr/bin/php-config -> /usr/php5/[version]/bin/php-config
	/usr/bin/phpize -> /usr/php5/[version]/bin/phpize

	/usr/share/man/man1/php.1

	/usr/php5/[version]/share/man/man1/php.1
	/usr/php5/[version]/share/man/man1/php-config.1
	/usr/php5/[version]/share/man/man1/phpize.1