diff options
| -rw-r--r-- | cpp/config/Make.rules.Darwin | 2 | ||||
| -rw-r--r-- | php/config/Make.rules.php | 2 | ||||
| -rw-r--r-- | php/src/IcePHP/Init.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index e3892b8bed3..d0901afe815 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -63,7 +63,7 @@ ifeq ($(embedded_runpath),yes) # If embedded_runpath_prefix is set it has preference # ifneq ($(embedded_runpath_prefix),) - RPATH_DIR = $(embedded_runpath_prefix) + RPATH_DIR = $(embedded_runpath_prefix)/lib endif ifeq ($(RPATH_DIR),) diff --git a/php/config/Make.rules.php b/php/config/Make.rules.php index 57eba985e12..076890ffe0a 100644 --- a/php/config/Make.rules.php +++ b/php/config/Make.rules.php @@ -103,7 +103,7 @@ else ICE_LIB_DIR = -L$(ice_dir)/lib$(lp64suffix) ICE_FLAGS = -I$(ice_dir)/include endif -ICE_LIBS = $(ICE_LIB_DIR) -lIce -lIceSSL -lSlice -lIceUtil +ICE_LIBS = $(ICE_LIB_DIR) -lIce -lIceSSL -lIceDiscovery -lIceLocatorDiscovery -lSlice -lIceUtil ifneq ($(embedded_runpath_prefix),) runpath_libdir := $(embedded_runpath_prefix)/lib$(lp64suffix) diff --git a/php/src/IcePHP/Init.cpp b/php/src/IcePHP/Init.cpp index a20c839801f..782d644b6d7 100644 --- a/php/src/IcePHP/Init.cpp +++ b/php/src/IcePHP/Init.cpp @@ -181,6 +181,10 @@ int initIceGlobals(zend_ice_globals* g) ZEND_MINIT_FUNCTION(ice) { + Ice::registerIceSSL(false); + Ice::registerIceDiscovery(false); + Ice::registerIceLocatorDiscovery(false); + REGISTER_INI_ENTRIES(); ZEND_INIT_MODULE_GLOBALS(ice, initIceGlobals, 0); |