]>
Commit | Line | Data |
---|---|---|
a8fcc5a6 JR |
1 | --- ntop-5.0.1/configure.in~ 2018-07-08 20:00:49.000000000 +0200 |
2 | +++ ntop-5.0.1/configure.in 2018-07-08 20:01:39.699063382 +0200 | |
3 | @@ -56,7 +56,7 @@ | |
4 | dnl> generate the config header | |
5 | dnl> | |
6 | umask 002 | |
7 | -AM_CONFIG_HEADER(config.h) | |
8 | +AC_CONFIG_HEADERS(config.h) | |
9 | ||
10 | HAS_ERROR= | |
11 | HAS_WARNING= | |
12 | @@ -133,7 +133,7 @@ | |
13 | ||
14 | # Set constants and defaults | |
15 | SO_VERSION_PATCH= | |
16 | -MAKE_SHARED_LIBRARY_PARM="-shared -flat_namespace" | |
17 | +MAKE_SHARED_LIBRARY_PARM="-shared" | |
18 | ||
19 | AS= | |
20 | CCLD= | |
21 | @@ -324,7 +324,7 @@ | |
22 | echo | |
23 | echo "Checking C compiler program and features..." | |
24 | echo | |
25 | -AM_PROG_CC_STDC | |
26 | +AC_PROG_CC | |
27 | if test ".${ac_cv_prog_cc_stdc}" = ".no"; then | |
28 | echo | |
29 | echo "*******************************************************************" | |
30 | @@ -1769,7 +1769,6 @@ | |
31 | exit 1 | |
32 | fi | |
33 | ||
34 | -cp "3rd_party/oui.txt.gz" . | |
35 | cp "3rd_party/specialMAC.txt.gz" . | |
36 | ||
37 | if test -d ./configureextra; then | |
38 | --- ntop-5.0.1/plugins/Makefile.am.orig 2012-02-02 12:17:12.000000000 +0100 | |
39 | +++ ntop-5.0.1/plugins/Makefile.am 2018-07-08 20:14:16.472513676 +0200 | |
40 | @@ -70,7 +70,8 @@ | |
41 | # | |
42 | ||
43 | ||
44 | -.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: | |
45 | +.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: netflowPlugin.o | |
46 | + mkdir -p .libs | |
47 | @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ | |
48 | $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ | |
49 | else \ | |
50 | @@ -82,7 +82,8 @@ | |
51 | ||
52 | ############### | |
53 | ||
54 | -.libs/librrdPlugin.so@SO_VERSION_PATCH@: | |
55 | +.libs/librrdPlugin.so@SO_VERSION_PATCH@: rrdPlugin.o | |
56 | + mkdir -p .libs | |
57 | @if test -f librrdPlugin_la-rrdPlugin.o; then \ | |
58 | $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \ | |
59 | else \ | |
60 | @@ -94,7 +94,8 @@ | |
61 | ||
62 | ############### | |
63 | ||
64 | -.libs/libsflowPlugin.so@SO_VERSION_PATCH@: | |
65 | +.libs/libsflowPlugin.so@SO_VERSION_PATCH@: sflowPlugin.o | |
66 | + mkdir -p .libs | |
67 | @if test -f libsflowPlugin_la-sflowPlugin.o; then \ | |
68 | $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \ | |
69 | else \ |