diff options
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/cc | 6 | ||||
| -rw-r--r-- | auto/lib/make | 24 | ||||
| -rw-r--r-- | auto/os/freebsd | 6 | ||||
| -rw-r--r-- | auto/sources | 1 |
4 files changed, 10 insertions, 27 deletions
@@ -5,6 +5,10 @@ case $CC in # optimization #CFLAGS="$CFLAGS -O2 -fomit-frame-pointer" + # optimize for Pentium Pro, Pentium II and Pentium III + CFLAGS="$CFLAGS -mcpu=pentiumpro" + # optimize for Pentium 4, gcc 3.x + #CFLAGS="$CFLAGS -mcpu=pentium4" # warnings CFLAGS="$CFLAGS -O -W" @@ -40,7 +44,7 @@ case $CC in # optimization CFLAGS="$CFLAGS -O" # optimize for Pentium Pro, Pentium II and Pentium III - #CFLAGS="$CFLAGS -mcpu=pentiumpro" + CFLAGS="$CFLAGS -mcpu=pentiumpro" # optimize for Pentium 4, default #CFLAGS="$CFLAGS -mcpu=pentium4" diff --git a/auto/lib/make b/auto/lib/make index fcf67a0c6..eb7d0285c 100644 --- a/auto/lib/make +++ b/auto/lib/make @@ -11,29 +11,7 @@ if [ "$PLATFORM" != "win32" ]; then if [ $MD5 != NO ]; then - echo "$MD5/libmd5.a:" >> $MAKEFILE - - case $PLATFORM in - - 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 - ;; - - esac - - echo >> $MAKEFILE + . auto/lib/md5/make fi diff --git a/auto/os/freebsd b/auto/os/freebsd index a0748f6fc..8178ab1b2 100644 --- a/auto/os/freebsd +++ b/auto/os/freebsd @@ -24,7 +24,7 @@ fi # sendfile if [ $version -gt 300007 ]; then - echo " + sendfile() found" + echo " + using sendfile()" have=HAVE_SENDFILE . auto/have CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS" @@ -36,7 +36,7 @@ fi if [ \( $version -lt 500000 -a $version -ge 410000 \) \ -o $version -ge 500011 ] then - echo " + kqueue found" + echo " + using kqueue" have=HAVE_KQUEUE . auto/have have=HAVE_CLEAR_EVENT . auto/have @@ -51,7 +51,7 @@ fi if [ \( $version -lt 500000 -a $version -ge 430000 \) \ -o $version -ge 500018 ] then - echo " + kqueue's NOTE_LAWAT found" + echo " + using kqueue's NOTE_LAWAT" have=HAVE_LOWAT_EVENT . auto/have fi diff --git a/auto/sources b/auto/sources index e2220766e..f6fdcc08c 100644 --- a/auto/sources +++ b/auto/sources @@ -57,6 +57,7 @@ EVENT_DEPS="src/event/ngx_event.h \ EVENT_SRCS="src/event/ngx_event.c \ src/event/ngx_event_timer.c \ + src/event/ngx_event_mutex.c \ src/event/ngx_event_accept.c \ src/event/ngx_event_connect.c \ src/event/ngx_event_pipe.c" |