|
1 |
| ---- configure.ac.in.orig 2024-08-13 16:12:12 UTC |
| 1 | +--- configure.ac.in.orig 2025-04-29 17:01:16 UTC |
2 | 2 | +++ configure.ac.in
|
3 | 3 | @@ -153,40 +153,8 @@ LIBPCAP=-lpcap
|
4 | 4 | MAKE=make
|
|
147 | 147 | AC_MSG_CHECKING([PF_RING nBPF])
|
148 | 148 | NBPF_HOME=${PWD}/../PF_RING/userland/nbpf
|
149 | 149 | LIBNBPF=${NBPF_HOME}/libnbpf.a
|
150 |
| -@@ -540,17 +453,12 @@ AS_VAR_IF(with_hiredis, yes, [ |
151 |
| - AS_VAR_IF(with_hiredis, yes, [ |
152 |
| - pkg-config --exists hiredis |
153 |
| - if test "$?" -ne 1; then |
154 |
| -- HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis" |
155 |
| -- if test $SYSTEM = "FreeBSD" && $FREEBSD_VERSION != "15"; then |
| 150 | +@@ -544,16 +457,11 @@ AS_VAR_IF(with_hiredis, yes, [ |
| 151 | + else |
| 152 | + pkg-config --exists hiredis |
| 153 | + if test "$?" -ne 1; then |
| 154 | +- HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis" |
| 155 | +- if test $SYSTEM = "FreeBSD" && $FREEBSD_VERSION != "15"; then |
156 | 156 | - dnl> Note: on freebsd 15 .a is not installed
|
157 | 157 | - HIREDIS_LIB="/usr/local/lib/libhiredis.a"
|
158 |
| -+ HIREDIS_INC="`pkg-config --cflags hiredis`" |
159 |
| -+ HIREDIS_LIB="`pkg-config --libs hiredis`" |
160 |
| - else |
161 |
| -- HIREDIS_LIB="`pkg-config --libs hiredis`" |
162 |
| -+ echo "Please install hiredis package prerequisite" |
163 |
| -+ exit -1 |
164 |
| - fi |
165 |
| -- else |
166 |
| -- echo "Please install hiredis package prerequisite" |
167 |
| -- exit -1 |
168 |
| -- fi |
| 158 | +- else |
| 159 | ++ HIREDIS_INC="`pkg-config --cflags hiredis`" |
| 160 | + HIREDIS_LIB="`pkg-config --libs hiredis`" |
| 161 | +- fi |
| 162 | + else |
| 163 | +- echo "Please install hiredis package prerequisite" |
| 164 | +- exit -1 |
| 165 | ++ echo "Please install hiredis package prerequisite" |
| 166 | ++ exit -1 |
| 167 | + fi |
| 168 | + fi |
169 | 169 | ])
|
170 |
| - |
171 |
| - if test "${with_nedge+set}" != set; then |
172 |
| -@@ -565,14 +473,14 @@ if test "${with_nedge+set}" != set; then |
| 170 | +@@ -570,14 +478,14 @@ if test "${with_nedge+set}" != set; then |
173 | 171 | fi
|
174 | 172 |
|
175 | 173 | if test $SYSTEM = "FreeBSD"; then
|
|
186 | 184 | AC_DEFINE_UNQUOTED(HAVE_PF_RING, 1, [Native PF_RING support])
|
187 | 185 | if test -f "${PF_RING_HOME}/userland/lib/libpfring.a"; then
|
188 | 186 | echo "${PF_RING_HOME}/userland/libpcap/libpcap.a"
|
189 |
| -@@ -592,18 +500,18 @@ if test "${with_nedge+set}" != set; then |
| 187 | +@@ -597,18 +505,18 @@ if test "${with_nedge+set}" != set; then |
190 | 188 | CXXFLAGS="${CXXFLAGS} -I/opt/pfring/include"
|
191 | 189 | echo "Using PF_RING installed in /opt/pfring"
|
192 | 190 | else
|
|
211 | 209 | echo "Please make sure you have installed your PF_RING libraries and try again"
|
212 | 210 | exit 1
|
213 | 211 | fi
|
214 |
| -@@ -784,11 +692,9 @@ else |
| 212 | +@@ -789,11 +697,9 @@ else |
215 | 213 | fi
|
216 | 214 | else
|
217 | 215 | dnl> FreeBSD
|
|
225 | 223 | fi
|
226 | 224 |
|
227 | 225 | AC_CHECK_LIB([expat], [XML_ParserCreate], expat=true)
|
228 |
| -@@ -843,7 +749,7 @@ fi |
| 226 | +@@ -848,7 +754,7 @@ fi |
229 | 227 | INSTALL_DIR=${ac_default_prefix}
|
230 | 228 | fi
|
231 | 229 |
|
|
0 commit comments