diff options
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/openssl/conf | 6 | ||||
| -rw-r--r-- | auto/lib/openssl/make | 1 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 0a70f3321..6792e7fd2 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -13,9 +13,15 @@ if [ $OPENSSL != NONE ]; then LINK_DEPS="$LINK_DEPS $OPENSSL/libssl.a $OPENSSL/libcrypto.a" CORE_LIBS="$CORE_LIBS $OPENSSL/libssl.a $OPENSSL/libcrypto.a" ;; + esac + case "$NGX_SYSTEM" in + SunOS|Linux) + CORE_LIBS="$CORE_LIBS -ldl" + ;; esac + else if [ $NGX_PLATFORM != win32 ]; then diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index 28ab00364..400761412 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -6,6 +6,7 @@ case $NGX_PLATFORM in *) echo "$OPENSSL/libssl.a:" >> $MAKEFILE echo " cd $OPENSSL \\" >> $MAKEFILE + echo " && \$(MAKE) clean \\" >> $MAKEFILE echo " && CC=\"\$(CC)\" \\" >> $MAKEFILE echo " ./config threads no-shared \\" >> $MAKEFILE echo " && \$(MAKE)" >> $MAKEFILE diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 1884b5026..8c1abdc44 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -54,7 +54,7 @@ END $ZLIB/libz.a: $NGX_MAKEFILE cd $ZLIB \\ - && make clean \\ + && \$(MAKE) clean \\ && cp contrib/asm586/match.S . \\ && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ ./configure \\ @@ -71,7 +71,7 @@ END $ZLIB/libz.a: $NGX_MAKEFILE cd $ZLIB \\ - && make clean \\ + && \$(MAKE) clean \\ && cp contrib/asm686/match.S . \\ && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ ./configure \\ @@ -104,7 +104,7 @@ if [ $done = NO ]; then $ZLIB/libz.a: $NGX_MAKEFILE cd $ZLIB \\ - && make clean \\ + && \$(MAKE) clean \\ && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\ ./configure \\ && \$(MAKE) libz.a |