This changes the behaviour of the DSO mechanism for determining an

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 1e6e5fce038c1040eca0e5d9be89fc14eb4ab767..7d938396d1d68073522195bac69d1015898872c3 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -207,7 +207,7 @@ sub_all:
        fi; \
        done; \
        if echo "$(DIRS)" | \
-           grep '\(^\| \)\(crypto\|ssl\)\( \|$$\)' > /dev/null 2>&1 && \
+           egrep '(^| )(crypto|ssl)( |$$)' > /dev/null 2>&1 && \
           [ -n "$(SHARED_LIBS)" ]; then \
                $(MAKE) $(SHARED_LIBS); \
        fi
@@ -281,7 +281,8 @@ do_solaris-shared:
 # This assumes that GNU utilities are *not* used
 do_hpux-shared:
        libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-       ( set -x; /usr/ccs/bin/ld -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+       ( set -x; /usr/ccs/bin/ld +vnocompatwarnings \
+               -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
                +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
                -Fl lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
        libs="$$libs -L. -l$$i"; \