4b7c37750e
Changelog since 1.4.0 version 2.0.2 * Fixed bug #3401971 (node-by-reference on dynamic collections) * documentation improvements * installer improvements * Fixed bug #3403291 (build for Fedora 15) * Don't install the .so for test modules * Fix for running ctest on Windows version 2.0.1 * Custom Full-text stemming. * Custom Full-text tokenization. * Fixed scripting bug where apply statement was considered a * sequential expr even if the source expr was non-updating and * non-sequential. * Fixed bug #3394400 (Element replacement, really unexpected result) * Fixed bug #3394588 (Unexpected error during pul undo) * Fixed bugs #3398511 and #3398552 with "make install" * Fixed bug #3398521 for compiling with ZORBA_NO_XMLSCHEMA version 2.0 * Zorba 2.0 is a major rewrite of previous versions. It doesn't claim to preserve backwards compatibility with any 1.X version. Host language API changes have been made to the following components: - External functions API - XmlDataManager - Error reporting - Debugger API XQuery language and API changes have been made to the following components: - XQuery Scripting Extension - Function APIs - XQuery Data Definition Facility - XQuery modules and module versioning - Changes to conform with the latest XQuery 3.0 - Namespaces of annotations, errors, collations. * In addition to host language API and XQuery language improvements, plenty of bug fixes and optimizations have been made. Feature safe: yes
41 lines
917 B
CMake
41 lines
917 B
CMake
--- cmake_modules/FindPHP5.cmake.orig 2011-09-15 09:46:24.000000000 +0200
|
|
+++ cmake_modules/FindPHP5.cmake 2011-09-15 09:48:14.000000000 +0200
|
|
@@ -27,15 +27,11 @@
|
|
SET(PHP5_FOUND "NO")
|
|
|
|
SET(PHP5_POSSIBLE_INCLUDE_PATHS
|
|
- /usr/include/php5
|
|
- /usr/local/include/php5
|
|
- /usr/include/php
|
|
- /usr/local/include/php
|
|
- /usr/local/apache/php
|
|
+ %%LOCALBASE%%/include/php
|
|
)
|
|
|
|
SET(PHP5_POSSIBLE_LIB_PATHS
|
|
- /usr/lib
|
|
+ %%LOCALBASE%%/lib/php
|
|
)
|
|
|
|
#FIND_PATH(PHP5_FOUND_INCLUDE_PATH main/php.h
|
|
@@ -52,9 +48,7 @@
|
|
FIND_PROGRAM(PHP5_EXECUTABLE
|
|
NAMES php5 php
|
|
PATHS
|
|
- /usr/bin
|
|
- /usr/local/bin
|
|
- ${PHP5_BINARY_DIR}
|
|
+ %%LOCALBASE%%/bin
|
|
)
|
|
MESSAGE(STATUS "Executable: " ${PHP5_EXECUTABLE})
|
|
|
|
@@ -108,8 +102,7 @@
|
|
FIND_PROGRAM(PHP5_CONFIG_EXECUTABLE
|
|
NAMES php5-config php-config
|
|
PATHS
|
|
- /usr/bin
|
|
- /usr/local/bin
|
|
+ %%LOCALBASE%%/bin
|
|
)
|
|
|
|
EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --version
|