blob: 8a50b7cb1a1038005cbf389e60eafcda680dbeac (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -231,31 +231,8 @@ NDPI_LIB=
NDPI_LIB_DEP=
AC_MSG_CHECKING(for nDPI source)
- if test -d "./nDPI" ; then :
- NDPI_HOME=./nDPI
- elif test -d "../nDPI" ; then :
- NDPI_HOME=../nDPI
- elif test -d "$HOME/nDPI" ; then :
- NDPI_HOME=$HOME/nDPI
- fi
-
- if test ! -z "$NDPI_HOME" ; then :
- AC_MSG_RESULT(found in $NDPI_HOME)
- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a
- AC_MSG_CHECKING(for $NDPI_LIB)
- if test -r $NDPI_LIB ; then :
- AC_MSG_RESULT(found $NDPI_LIB)
- else
- AC_MSG_RESULT(not found $NDPI_LIB: compiling)
- cd $NDPI_HOME; ./autogen.sh; ${MAKE}; cd -
- fi
- NDPI_INC="-I$NDPI_HOME/src/include -I$NDPI_HOME/src/lib/third_party/include"
- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a
- NDPI_LIB_DEP=$NDPI_LIB
- else
- AC_MSG_RESULT(not found)
- fi
-
+ NDPI_LIB="-lndpi"
+ NDPI_LIB_DEP=$NDPI_LIB
if test ! -z "$NDPI_CUST_INC" ; then :
NDPI_INC=$NDPI_CUST_INC
diff --git a/configure.ac.in b/configure.ac.in
index ed906b1..3e70bec 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -242,7 +242,7 @@ if test ! -z "$NDPI_CUST_LIB" ; then :
NDPI_LIB=$NDPI_CUST_LIB
fi
-if test -z "$NDPI_INC" || test -z "$NDPI_LIB" ; then :
+if test -z "$NDPI_LIB" ; then :
echo "Could not find nDPI"
echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; ${MAKE}; cd ../ntopng"
echo "and try again"
|
