diff options
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/make | 56 | ||||
| -rw-r--r-- | auto/lib/md5/conf | 17 |
2 files changed, 50 insertions, 23 deletions
diff --git a/auto/lib/make b/auto/lib/make index d4cba34f5..fcf67a0c6 100644 --- a/auto/lib/make +++ b/auto/lib/make @@ -2,36 +2,60 @@ if [ "$PLATFORM" != "win32" ]; then if [ $PCRE != NO ]; then - echo "$PCRE/.libs/libpcre.a:" >> $MAKEFILE - echo " cd $PCRE \\" >> $MAKEFILE - echo " && ./configure --disable-shared \\" >> $MAKEFILE - echo " && \$(MAKE)" >> $MAKEFILE - echo >> $MAKEFILE + echo "$PCRE/.libs/libpcre.a:" >> $MAKEFILE + echo " cd $PCRE \\" >> $MAKEFILE + echo " && ./configure --disable-shared \\" >> $MAKEFILE + echo " && \$(MAKE)" >> $MAKEFILE + echo >> $MAKEFILE fi if [ $MD5 != NO ]; then - echo "$MD5/libmd5.a:" >> $MAKEFILE + echo "$MD5/libmd5.a:" >> $MAKEFILE case $PLATFORM in - SunOS:*) - echo " cd $MD5 && \$(MAKE) x86-solaris" >> $MAKEFILE - ;; + SunOS:*:i386) + echo " cd $MD5 && \$(MAKE) x86-solaris" >> $MAKEFILE + ;; + + *:i386) + echo " cd $MD5 && \$(MAKE) x86-elf" >> $MAKEFILE + ;; + + *) + if [ $CC = gcc ]; then + echo " cd $MD5 && \$(MAKE) gcc" >> $MAKEFILE + else + echo " cd $MD5 && \$(MAKE) cc" >> $MAKEFILE + fi + ;; - *) - echo " cd $MD5 && \$(MAKE) x86-elf" >> $MAKEFILE - ;; esac - echo >> $MAKEFILE + echo >> $MAKEFILE fi if [ $ZLIB != NO ]; then - echo "$ZLIB/libz.a:" >> $MAKEFILE - echo " cd $ZLIB && ./configure && \$(MAKE)" >> $MAKEFILE - echo >> $MAKEFILE + echo "$ZLIB/libz.a:" >> $MAKEFILE + + case $PLATFORM in + + *:i386) + echo " cd $ZLIB \\" >> $MAKEFILE + echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE + echo " && CFLAGS=\"-O3 -DASMV\" ./configure \\" >> $MAKEFILE + echo " && \$(MAKE) OBJA=match.o" >> $MAKEFILE + ;; + + *) + echo " cd $ZLIB && ./configure && \$(MAKE)" >> $MAKEFILE + ;; + + esac + + echo >> $MAKEFILE fi fi diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index 4f6a6364b..06006e456 100644 --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -27,11 +27,12 @@ ngx_lib_inc="#include <sys/types.h> MD5=NO - # Solaris 8/9 - ngx_lib="rsaref md5" - ngx_lib_test="MD5_CTX md5; MD5Init(&md5)" - ngx_libs=-lmd5 - . auto/lib/test + # Solaris 8/9 + + ngx_lib="rsaref md5" + ngx_lib_test="MD5_CTX md5; MD5Init(&md5)" + ngx_libs=-lmd5 + . auto/lib/test if [ $ngx_found = yes ]; then @@ -42,6 +43,7 @@ ngx_lib_inc="#include <sys/types.h> else # FreeBSD + ngx_lib="rsaref md" ngx_lib_test="MD5_CTX md5; MD5Init(&md5)" ngx_libs=-lmd @@ -56,8 +58,9 @@ ngx_lib_inc="#include <sys/types.h> ngx_found=no else - ngx_lib_inc="#include <sys/types.h> -#include <openssl/md5.h>" + # OpenSSL crypto library + + ngx_inc="#include <openssl/md5.h>" ngx_lib="OpenSSL md5 crypto" ngx_lib_test="MD5_CTX md5; MD5_Init(&md5)" ngx_libs=-lcrypto |