Mercurial > hg > nginx

comparison auto/lib/pcre/conf @ 6397:78f8ac479735

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: simplified and improved handling of MSVC versions. Now we always set NGX_CC_NAME to "msvc", and additionally test compiler version as reported by "cl" in auto/cc/msvc (the same version is also available via the _MSC_VER define). In particular, this approach allows to properly check for C99 variadic macros support, which previously was not used with MSVC versions not explicitly recognized. Now unneeded wildcards in NGX_CC_NAME tests for msvc removed accordingly, as well as unused wildcards for owc and icc.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 13 Feb 2016 06:47:34 +0300
parents 3d2d3e1cf427
children 8007ea138d6a
comparison
equal deleted inserted replaced
6396:dcfe355dfda4 6397:78f8ac479735
6 if [ $PCRE != NONE ]; then 6 if [ $PCRE != NONE ]; then
7 CORE_INCS="$CORE_INCS $PCRE" 7 CORE_INCS="$CORE_INCS $PCRE"
8 8
9 case "$NGX_CC_NAME" in 9 case "$NGX_CC_NAME" in
10 10
11 msvc* | owc* | bcc) 11 msvc | owc | bcc)
12 have=NGX_PCRE . auto/have 12 have=NGX_PCRE . auto/have
13 have=PCRE_STATIC . auto/have 13 have=PCRE_STATIC . auto/have
14 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" 14 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
15 LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib" 15 LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
16 CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib" 16 CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib"
17 ;; 17 ;;
18 18
19 icc* ) 19 icc)
20 have=NGX_PCRE . auto/have 20 have=NGX_PCRE . auto/have
21 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" 21 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
22 22
23 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" 23 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
24 24