Turn on OPENSSL_NO_DEPRECATED by default.

[openssl.git] / util / shlib_wrap.sh

diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh
index cbec5f040cceeda71b608f5669ce4605c00d76b5..8775cb5411e1f2397eb0e138203b2c9636411f50 100755 (executable)
--- a/util/shlib_wrap.sh
+++ b/util/shlib_wrap.sh
@@ -27,6 +27,12 @@ SunOS|IRIX*)
                LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64
                preload_var=LD_PRELOAD_64
                ;;
+       # Why are newly built .so's preloaded anyway? Because run-time
+       # .so lookup path embedded into application takes precedence
+       # over LD_LIBRARY_PATH and as result application ends up linking
+       # to previously installed .so's. On IRIX instead of preloading
+       # newly built .so's we trick run-time linker to fail to find
+       # the installed .so by setting _RLD_ROOT variable.
        *ELF\ 32*MIPS*)
                #_RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD_LIST
                _RLD_ROOT=/no/such/dir; export _RLD_ROOT
@@ -74,7 +80,7 @@ if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
        # it into a script makes it possible to do so on multi-ABI
        # platforms.
        case "$SYSNAME" in
-       *BSD)   LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;  # *BSD
+       *BSD|QNX)       LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;  # *BSD, QNX
        *)      LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;;  # SunOS, Linux, ELF HP-UX
        esac
        _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"      # Tru64, o32 IRIX
@@ -82,4 +88,10 @@ if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
        export LD_PRELOAD _RLD_LIST DYLD_INSERT_LIBRARIES
 fi
 
-exec "$@"
+cmd="$1${EXE_EXT}"
+shift
+if [ $# -eq 0 ]; then
+       exec "$cmd"     # old sh, such as Tru64 4.x, fails to expand empty "$@"
+else
+       exec "$cmd" "$@"
+fi