diff options
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/cc/icc | 2 | ||||
| -rw-r--r-- | auto/lib/pcre/conf | 27 | ||||
| -rw-r--r-- | auto/lib/pcre/make | 4 |
3 files changed, 25 insertions, 8 deletions
diff --git a/auto/cc/icc b/auto/cc/icc index 1c59c5561..b82a17d62 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -97,7 +97,7 @@ case "$NGX_ICC_VER" in CFLAGS="$CFLAGS -wd1469" # STUB - # non-POD class type passed through ellipsis + # non-POD class type passed through ellipsis, Linux only ? CFLAGS="$CFLAGS -wd1595" ;; diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index 65163272a..1b79f94ec 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -23,11 +23,30 @@ if [ $PCRE != NONE ]; then LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" + echo $ngx_n "checking for PCRE library ...$ngx_c" + + ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \ + | sed -e 's/^.*=\(.*\)$/\1/'` + + echo " $ngx_pcre_ver major version found" + # to allow -ipo optimization we link with the *.o but not library - CORE_LIBS="$CORE_LIBS $PCRE/maketables.o" - CORE_LIBS="$CORE_LIBS $PCRE/get.o" - CORE_LIBS="$CORE_LIBS $PCRE/study.o" - CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" + + case "$ngx_pcre_ver" in + 6) + CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o" + CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o" + ;; + + *) + CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" + ;; + esac ;; *) diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index f57f7d9ec..f5723c852 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -55,9 +55,7 @@ END $PCRE/pcre.h: $NGX_MAKEFILE cd $PCRE \\ - && if [ -f Makefile ]; then \$(MAKE) distclean; fi - - cd $PCRE \\ + && if [ -f Makefile ]; then \$(MAKE) distclean; fi \\ && CC="\$(CC)" CFLAGS="$PCRE_OPT" \\ ./configure --disable-shared |