1 diff -urN ntop.org/Makefile.am ntop/Makefile.am
2 --- ntop.org/Makefile.am Mon Mar 26 19:30:37 2001
3 +++ ntop/Makefile.am Mon Mar 26 20:14:32 2001
8 - @cp -p ntop-cert.pem $(bindir)/ntop-cert.pem
9 - @$(top_srcdir)/mkinstalldirs $(libdir)/plugins;
10 - @$(top_srcdir)/mkinstalldirs $(datadir)/ntop;
11 - @$(top_srcdir)/mkinstalldirs $(datadir)/ntop/html;
12 + @cp -p ntop-cert.pem $(DESTDIR)$(bindir)/ntop-cert.pem
13 + @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/plugins;
14 + @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop;
15 + @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop/html;
16 @for file in $(NTOPHTML); do \
17 if test -d $$file; then \
18 - $(top_srcdir)/mkinstalldirs $(datadir)/ntop/$$file; \
19 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop/$$file; \
21 - cp -p $$file $(datadir)/ntop/$$file; \
22 + cp -p $$file $(DESTDIR)$(datadir)/ntop/$$file; \
26 diff -urN ntop.org/configure.in ntop/configure.in
27 --- ntop.org/configure.in Mon Mar 26 19:30:37 2001
28 +++ ntop/configure.in Mon Mar 26 20:16:17 2001
30 echo "checking for ncurses.h... yes"
31 AC_DEFINE(HAVE_NCURSES_H)
33 + if test -f "/usr/include/ncurses/ncurses.h"; then
34 + echo "checking for ncurses/ncurses.h... yes"
35 + CFLAGS="$CFLAGS -I/usr/include/ncurses"
36 + AC_DEFINE(HAVE_NCURSES_H)
38 if test -f "/usr/include/curses.h"; then
39 echo "checking for curses.h... yes"
40 AC_DEFINE(HAVE_CURSES_H)
42 AC_MSG_WARN([It looks that you don't have ncurses.h/curses.h installed. Some ntop's features will be disabled.])
50 if test ".$ac_enable_tcpwrap" = ".yes"; then
51 AC_MSG_WARN([TCP Wrap support enabled, if available, via command line option!])
52 - AC_CHECK_LIB(wrap, request_init, MORELIBS="$MORELIBS -lwrap" && AC_DEFINE(HAVE_LIBWRAP))
53 + AC_MSG_CHECKING(for libwrap)
58 +int deny_severity = 0, allow_severity = 0;
63 + MORELIBS="$MORELIBS -lwrap"
64 + AC_DEFINE(HAVE_LIBWRAP)
74 if test ".${GDCHART_ROOT}" != .; then
75 if test -d $GDCHART_ROOT &&
76 test -r $GDCHART_ROOT/libgdchart.a &&
77 - test -r $GDCHART_ROOT/gdc.h &&
78 - test -r $GDCHART_ROOT/gd-1.8.3/libgd.a &&
79 - test -r $GDCHART_ROOT/gd-1.8.3/gd.h &&
80 - test -r $GDCHART_ROOT/zlib-1.1.3/libz.a; then
81 + test -r $GDCHART_ROOT/gdc.h; then
82 GDCHART_ROOT=`cd ${GDCHART_ROOT} && pwd`
83 - MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -L$GDCHART_ROOT/gd-1.8.3 -lgd -L$GDCHART_ROOT/gd-1.8.3/libpng-1.0.8 -lpng -L$GDCHART_ROOT/zlib-1.1.3 -lz"
84 + MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -lgd -lpng -lz"
85 INCS="${INCS} -I$GDCHART_ROOT"
86 AC_DEFINE(HAVE_GDCHART)
87 AC_MSG_RESULT([found in $GDCHART_ROOT])
90 if test -d ../gdchart0.94c &&
91 test -r ../gdchart0.94c/gdc.h &&
92 - test -r ../gdchart0.94c/libgdchart.a &&
93 - test -r ../gdchart0.94c/gd-1.8.3/libgd.a &&
94 - test -r ../gdchart0.94c/gd-1.8.3/gd.h &&
95 - test -r ../gdchart0.94c/gd-1.8.3/libpng-1.0.8/libpng.a &&
96 - test -r ../gdchart0.94c/gd-1.8.3/libpng-1.0.8/gd.h; then
97 + test -r ../gdchart0.94c/libgdchart.a; then
98 GDCHART_ROOT="../gdchart0.94c"
99 GDCHART_ROOT=`cd ${GDCHART_ROOT} && pwd`
100 - MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -L$GDCHART_ROOT/gd-1.8.3 -lgd -L$GDCHART_ROOT/gd-1.8.3/libpng-1.0.8 -lpng"
101 + MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -lgd -lpng"
102 INCS="${INCS} -I$GDCHART_ROOT"
103 AC_DEFINE(HAVE_GDCHART)
104 AC_MSG_RESULT([found in $GDCHART_ROOT])
105 @@ -921,11 +936,14 @@
106 AC_MSG_CHECKING([for OpenSSL Library by Open SLL Project (optional package)])
107 if test ".${OSSL_ROOT}" != .; then
108 if test -d $OSSL_ROOT &&
109 - test -r $OSSL_ROOT/libssl.a &&
110 - test -r $OSSL_ROOT/openssl/ssl.h; then
111 + test -r $OSSL_ROOT/lib/libssl.so &&
112 + test -r $OSSL_ROOT/include/openssl/ssl.h; then
113 + if test -f $OSSL_ROOT/lib/libcrypto.so; then
114 + MORELIBS="${MORELIBS} -lcrypto"
116 OSSL_ROOT=`cd ${OSSL_ROOT} && pwd`
117 - MORELIBS="${MORELIBS} -L$OSSL_ROOT -lssl"
118 - INCS="${INCS} -I$OSSL_ROOT"
119 + MORELIBS="${MORELIBS} -L$OSSL_ROOT/lib -lssl"
120 + INCS="${INCS} -I$OSSL_ROOT/include/openssl"
121 AC_DEFINE(HAVE_OPENSSL)
122 AC_MSG_RESULT([found in $OSSL_ROOT])
124 @@ -1005,8 +1023,7 @@
125 dnl> Do not walk in the plugins/ subdir if the user decided he/she does not need any plugin.
127 if test "$ac_disable_plugins" = yes; then
131 AC_MSG_WARN([compilation of ntop's plugins disabled via command line option!])
134 diff -urN ntop.org/intop/intop.c ntop/intop/intop.c
135 --- ntop.org/intop/intop.c Mon Mar 26 19:30:37 2001
136 +++ ntop/intop/intop.c Mon Mar 26 20:14:32 2001
138 int active = -1; /* an index for the active interface (if any) */
139 int previous = -1; /* an index for the previous interface (if any) */
142 +int allow_severity = LOG_INFO;
143 +int deny_severity = LOG_WARNING;
148 diff -urN ntop.org/main.c ntop/main.c
149 --- ntop.org/main.c Mon Mar 26 19:30:37 2001
150 +++ ntop/main.c Mon Mar 26 20:14:32 2001
153 /* That's the meat */
154 int main(int argc, char *argv[]) {
156 + int allow_severity = LOG_INFO;
157 + int deny_severity = LOG_WARNING;
162 diff -urN ntop.org/plugins/Makefile.am ntop/plugins/Makefile.am
163 --- ntop.org/plugins/Makefile.am Mon Mar 26 19:30:37 2001
164 +++ ntop/plugins/Makefile.am Mon Mar 26 20:14:32 2001
166 @ln -s .libs/libwapPlugin.so wapPlugin.so
169 - @$(top_srcdir)/mkinstalldirs $(plugindir);
170 + @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir);
171 @for file in $(noinst_PROGRAMS); do \
172 - cp -p $$file $(plugindir)/$$file; \
173 + cp -p $$file $(DESTDIR)$(plugindir)/$$file; \
175 # remove installed libraries
176 @for file in $(lib_LTLIBRARIES); do \