IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-29 20:24:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

icc and PCRE-6.5+ compatibility

Browse Source
This commit is contained in:
Igor Sysoev 2007-01-10 16:15:49 +00:00
parent 673382f2aa
commit feb42254ba
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
auto/lib/pcre/conf
View File

@ -25,14 +25,24 @@ if [ $PCRE != NONE ]; then
echo $ngx_n "checking for PCRE library ...$ngx_c" echo $ngx_n "checking for PCRE library ...$ngx_c"
ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \ if [ -e $PCRE/pcre.h ]; then
| sed -e 's/^.*=\(.*\)$/\1/'` ngx_pcre_ver=`grep PCRE_MAJOR $PCRE/pcre.h \
| sed -e 's/^.*PCRE_MAJOR.* \(.*\)$/\1/'`
else
ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \
| sed -e 's/^.*=\(.*\)$/\1/'`
fi
echo " $ngx_pcre_ver major version found" echo " $ngx_pcre_ver major version found"
# to allow -ipo optimization we link with the *.o but not library # to allow -ipo optimization we link with the *.o but not library
case "$ngx_pcre_ver" in case "$ngx_pcre_ver" in
4|5)
CORE_LIBS="$CORE_LIBS $PCRE/pcre.o"
;;
6) 6)
CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o" CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o"
CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o" CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o"
@ -44,8 +54,16 @@ if [ $PCRE != NONE ]; then
;; ;;
*) *)
CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" 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_newline.o"
;; ;;
esac esac
;; ;;