Mercurial > hg > nginx

comparison auto/lib/pcre/conf @ 876:853abb6c4c89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix the previous commit
author Igor Sysoev <igor@sysoev.ru>
date Mon, 27 Nov 2006 11:12:34 +0000
parents 7af8276b1c2f
children 0d0c74b73573
comparison
equal deleted inserted replaced
875:7af8276b1c2f 876:853abb6c4c89
103 ngx_found=no 103 ngx_found=no
104 104
105 else 105 else
106 # Linux package 106 # Linux package
107 107
108 ngx_feature="PCRE library in /usr/include/pcre/" 108 if [ $PCRE = NO ]; then
109 ngx_feature_name="NGX_PCRE" 109
110 ngx_feature_run=no 110 ngx_feature="PCRE library in /usr/include/pcre/"
111 ngx_feature_incs="#include <pcre.h>" 111 ngx_feature_name="NGX_PCRE"
112 ngx_feature_path="/usr/include/pcre" 112 ngx_feature_run=no
113 ngx_feature_libs="-lpcre" 113 ngx_feature_incs="#include <pcre.h>"
114 ngx_feature_test="pcre *re; 114 ngx_feature_path="/usr/include/pcre"
115 re = pcre_compile(NULL, 0, NULL, 0, NULL)" 115 ngx_feature_libs="-lpcre"
116 . auto/feature 116 ngx_feature_test="pcre *re;
117 re = pcre_compile(NULL, 0, NULL, 0, NULL)"
118 . auto/feature
119 fi
117 fi 120 fi
118 121
119 if [ $ngx_found = yes ]; then 122 if [ $ngx_found = yes ]; then
120 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" 123 CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
121 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" 124 CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
125 ngx_found=no 128 ngx_found=no
126 129
127 else 130 else
128 # NetBSD port 131 # NetBSD port
129 132
130 ngx_feature="PCRE library in /usr/pkg/" 133 if [ $PCRE = NO ]; then
131 ngx_feature_name="NGX_PCRE" 134
132 ngx_feature_run=no 135 ngx_feature="PCRE library in /usr/pkg/"
133 ngx_feature_incs="#include <pcre.h>" 136 ngx_feature_name="NGX_PCRE"
134 ngx_feature_path="/usr/pkg/include" 137 ngx_feature_run=no
135 ngx_feature_libs="-L /usr/pkg/lib -lpcre" 138 ngx_feature_incs="#include <pcre.h>"
136 ngx_feature_test="pcre *re; 139 ngx_feature_path="/usr/pkg/include"
137 re = pcre_compile(NULL, 0, NULL, 0, NULL)" 140 ngx_feature_libs="-L /usr/pkg/lib -lpcre"
138 . auto/feature 141 ngx_feature_test="pcre *re;
142 re = pcre_compile(NULL, 0, NULL, 0, NULL)"
143 . auto/feature
144 fi
139 fi 145 fi
140 146
141 if [ $ngx_found = yes ]; then 147 if [ $ngx_found = yes ]; then
142 CORE_DEPS="$CORE_DEPS $REGEX_DEPS" 148 CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
143 CORE_SRCS="$CORE_SRCS $REGEX_SRCS" 149 CORE_SRCS="$CORE_SRCS $REGEX_SRCS"