From: Christopher Jones <sixd@php.net>
Date: Mon, 31 Oct 2011 20:48:25 +0000 (+0000)
Subject: OCI8: improve initialization error message (See bug 60154)
X-Git-Tag: php-5.4.0RC1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4eb5f238783397860524719427507f34ecea0f1;p=php

OCI8: improve initialization error message (See bug 60154)
---

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 88f95e8659..275483ee2f 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -79,11 +79,14 @@ static PHP_GSHUTDOWN_FUNCTION(oci);
 #endif
 
 /* For a user friendly message about environment setup */
-/* TODO: add cases for SHLIB_PATH, LIBPATH, LD_LIBRARY_PATH_64 etc */
 #if defined(PHP_WIN32)
 #define PHP_OCI8_LIB_PATH_MSG "PATH"
 #elif defined(__APPLE__)
 #define PHP_OCI8_LIB_PATH_MSG "DYLD_LIBRARY_PATH"
+#elif defined(_AIX)
+#define PHP_OCI8_LIB_PATH_MSG "LIBPATH"
+#elif defined(__hpux)
+#define PHP_OCI8_LIB_PATH_MSG "SHLIB_PATH"
 #else
 #define PHP_OCI8_LIB_PATH_MSG "LD_LIBRARY_PATH"
 #endif