blob: a2476f5b407d1ee38482f1166b2e8d22c139d292 (
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
50
51
52
53
54
55
56
57
58
59
60
61
62
|
--- configure.ac.orig 2017-06-09 06:47:34.214516588 +0200
+++ configure.ac 2017-06-09 06:48:01.547849759 +0200
@@ -19,7 +19,6 @@
# On CentOS 6 `git rev-list HEAD --count` does not work
#
#
-REVISION=`git log --pretty=oneline | wc -l`
if test -d "/usr/local/include"; then
CFLAGS="${CFLAGS} -I/usr/local/include"
@@ -48,33 +47,6 @@
SHORT_MACHINE=`uname -m | cut -b1-3`
-GIT_RELEASE="@GIT_RELEASE@"
-GIT_DATE="@GIT_DATE@"
-GIT_BRANCH="@GIT_BRANCH@"
-PRO_GIT_RELEASE="@PRO_GIT_RELEASE@"
-PRO_GIT_DATE="@PRO_GIT_DATE@"
-
-AC_MSG_CHECKING(for nDPI)
-NDPI_HOME=./nDPI
-if test -d "$NDPI_HOME" ; then :
- AC_MSG_RESULT(found in $NDPI_HOME)
-else
- NDPI_HOME=../nDPI
- if test -d "$NDPI_HOME"; then :
- AC_MSG_RESULT(found in $NDPI_HOME)
- else
- NDPI_HOME=$HOME/nDPI
- if test -d "$NDPI_HOME"; then :
- AC_MSG_RESULT(found in $NDPI_HOME)
- else
- AC_MSG_RESULT(not found)
- echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng"
- echo " and try again"
- exit
- fi
- fi
-fi
-
if test -d "/usr/include/openssl"; then :
AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
--- configure.ac.orig 2017-06-09 09:58:17.021114895 +0200
+++ configure.ac 2017-06-09 09:58:24.227781519 +0200
@@ -53,15 +53,6 @@
SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
fi
-NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a
-AC_MSG_CHECKING(for $NDPI_LIB)
-if test -f "$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
-
AC_MSG_CHECKING(for ntopng professional edition)
PRO_MAKEFILE_INC=
PRO_INC=
|
GitWeb
