1 diff -Nur ntop-current.orig/gdchart0.94c/Makefile.in ntop-current/gdchart0.94c/Makefile.in
2 --- ntop-current.orig/gdchart0.94c/Makefile.in Thu Oct 10 14:45:07 2002
3 +++ ntop-current/gdchart0.94c/Makefile.in Thu Oct 10 14:46:46 2002
5 $(CC) -g -c price_conv.c
8 - $(CC) -I$(GD_INCL) -I$(GDC_INCL) -g -c gdc.c
9 + $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(CFLAGS) -c gdc.c
11 gdc_pie.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie.c
12 - $(CC) -I$(GD_INCL) -I$(GDC_INCL) -g -c gdc_pie.c
13 + $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(CFLAGS) -c gdc_pie.c
15 gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdchart.c
16 - $(CC) -I$(GD_INCL) -I$(GDC_INCL) -g -c gdchart.c
17 + $(CC) -I$(GD_INCL) -I$(GDC_INCL) $(CFLAGS) -c gdchart.c
20 cd $(GD_LIB) ; $(MAKE) -f Makefile libgd.a
21 diff -Nur ntop-current.orig/ntop/Makefile.am ntop-current/ntop/Makefile.am
22 --- ntop-current.orig/ntop/Makefile.am Thu Aug 8 17:19:16 2002
23 +++ ntop-current/ntop/Makefile.am Thu Oct 10 15:04:14 2002
26 SUBDIRS = . @PLUGINS@ @INTOP@
28 -DIST_COMMON = AUTHORS CONTENTS COPYING ChangeLog \
29 - MANIFESTO NEWS PORTING \
30 - SUPPORT_NTOP.txt THANKS \
31 - ntop.8 ntop.txt ntop.html \
34 NTOPHTML = html html/*.js html/*.html html/*.gif html/*.jpg html/*.ico html/*.png html/*.css html/statsicons \
35 html/statsicons/flags html/statsicons/os \
36 html/statsicons/flags/*.gif html/statsicons/os/*.gif
38 configure configure.in \
39 install-sh libtool ltconfig ltmain.sh \
40 missing mkinstalldirs ntop-config.in \
43 + CONTENTS MANIFESTO PORTING SUPPORT_NTOP.txt \
44 + ntop.txt ntop.html ntop-cert.pem
46 WEBFILES = `cat www/FILES`
47 PLUGINSFILES = `cat plugins/FILES`
48 diff -Nur ntop-current.orig/ntop/configure.in ntop-current/ntop/configure.in
49 --- ntop-current.orig/ntop/configure.in Wed Oct 2 00:05:06 2002
50 +++ ntop-current/ntop/configure.in Thu Oct 10 15:03:06 2002
52 if test -f "/usr/include/ncurses.h"; then
53 echo "checking for ncurses.h... yes"
54 AC_DEFINE(HAVE_NCURSES_H)
55 + else if test -f "/usr/include/ncurses/ncurses.h"; then
56 + echo "checking for ncurses/ncurses.h... yes"
57 + AC_DEFINE(HAVE_NCURSES_H)
58 + INCS="${INCS} -I/usr/include/ncurses"
60 if test -f "/usr/include/curses.h"; then
61 echo "checking for curses.h... yes"
72 if test ".${PCAP_ROOT}" != .; then
73 if test -d ${PCAP_ROOT} &&
74 - test -r ${PCAP_ROOT}/libpcap.a &&
75 + test -r ${PCAP_ROOT}/libpcap.a -o -r ${PCAP_ROOT}/libpcap.so &&
76 test -r ${PCAP_ROOT}/pcap.h; then
77 PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
78 CORELIBS="${CORELIBS} -L${PCAP_ROOT} -lpcap"
80 elif test -d ${PCAP_ROOT} &&
81 test -d ${PCAP_ROOT}/lib &&
82 test -d ${PCAP_ROOT}/include &&
83 - test -r ${PCAP_ROOT}/lib/libpcap.a &&
84 + test -r ${PCAP_ROOT}/lib/libpcap.a -o -r ${PCAP_ROOT}/lib/libpcap.so &&
85 test -r ${PCAP_ROOT}/include/pcap.h; then
86 PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
87 CORELIBS="${CORELIBS} -L${PCAP_ROOT}/lib -lpcap"
89 test -d ${PCAP_ROOT}/lib &&
90 test -d ${PCAP_ROOT}/include &&
91 test -d ${PCAP_ROOT}/include/pcap &&
92 - test -r ${PCAP_ROOT}/lib/libpcap.a &&
93 + test -r ${PCAP_ROOT}/lib/libpcap.a -o -r ${PCAP_ROOT}/lib/libpcap.so &&
94 test -r ${PCAP_ROOT}/include/pcap/pcap.h; then
95 PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
96 CORELIBS="${CORELIBS} -L${PCAP_ROOT}/lib -lpcap"
98 dnl> Older default installation
100 elif test -d /usr/local &&
101 - test -r /usr/local/lib/libpcap.a &&
102 + test -r /usr/local/lib/libpcap.a -o -r /usr/local/lib/libpcap.so &&
103 test -r /usr/local/include/pcap.h; then
104 PCAP_ROOT="/usr/local"
105 CORELIBS="${CORELIBS} -L$PCAP_ROOT/lib -lpcap"
108 dnl> installation used by most packagers
110 -elif test -r /usr/lib/libpcap.a &&
111 +elif test -r /usr/lib/libpcap.a -o -r /usr/lib/libpcap.so &&
112 test -r /usr/include/pcap.h; then
113 PCAP_ROOT="standard installation (/usr/lib and /usr/include)"
114 CORELIBS="${CORELIBS} -lpcap"
116 dnl> unusual and more complex installation used by some packagers
117 dnl> (e.g. Red Hat Linux)
119 -elif test -r /usr/lib/libpcap.a &&
120 +elif test -r /usr/lib/libpcap.a -o -r /usr/lib/libpcap.so &&
121 test -r /usr/include/pcap/pcap.h; then
122 PCAP_ROOT="semi-standard installation (/usr/lib and /usr/include/pcap)"
123 CORELIBS="${CORELIBS} -lpcap"
124 @@ -1327,8 +1331,8 @@
125 AC_MSG_CHECKING([for libxxx.a in $1 and ssl.h in $2])
128 - test -r $1/libssl.a &&
129 - test -r $1/libcrypto.a &&
130 + test -r $1/libssl.a -o $1/libssl.so &&
131 + test -r $1/libcrypto.a -o $1/libcrypto.so &&
133 test -r $2/ssl.h; then
134 if test ".$ac_enable_showopenssltests" = ".yes"; then
135 diff -Nur ntop-current.orig/ntop/intop/Makefile.am ntop-current/ntop/intop/Makefile.am
136 --- ntop-current.orig/ntop/intop/Makefile.am Wed Jan 2 09:17:15 2002
137 +++ ntop-current/ntop/intop/Makefile.am Thu Oct 10 15:04:32 2002
139 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
142 -DIST_COMMON = Makefile.am Makefile.in intop.1
144 DISTCLEANFILES = logger.db ntop.db ntop_pw.db intops
145 CLEANFILES = $(DISTCLEANFILES)
147 diff -Nur ntop-current.orig/ntop/plugins/Makefile.am ntop-current/ntop/plugins/Makefile.am
148 --- ntop-current.orig/ntop/plugins/Makefile.am Tue Sep 10 16:13:19 2002
149 +++ ntop-current/ntop/plugins/Makefile.am Thu Oct 10 15:04:41 2002
154 -DIST_COMMON = Makefile.am Makefile.in
159 .libs/libicmpPlugin.so@SO_VERSION_PATCH@:
160 $(CC) -bundle -flat_namespace -undefined suppress -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ icmpPlugin.o
162 -icmpPlugin.so: .libs/libicmpPlugin.so@SO_VERSION_PATCH@
163 +icmpPlugin.so$(EXEEXT): .libs/libicmpPlugin.so@SO_VERSION_PATCH@
164 @ln -s .libs/libicmpPlugin.so icmpPlugin.so
166 #.libs/librrdPlugin.so@SO_VERSION_PATCH@:
167 @@ -105,31 +104,31 @@
168 .libs/libpdaPlugin.so@SO_VERSION_PATCH@:
169 $(CC) -bundle -flat_namespace -undefined suppress -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ pdaPlugin.o
171 -pdaPlugin.so: .libs/libpdaPlugin.so@SO_VERSION_PATCH@
172 +pdaPlugin.so$(EXEEXT): .libs/libpdaPlugin.so@SO_VERSION_PATCH@
173 @ln -s .libs/libpdaPlugin.so pdaPlugin.so
175 .libs/libsflowPlugin.so@SO_VERSION_PATCH@:
176 $(CC) -bundle -flat_namespace -undefined suppress -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o
178 -sflowPlugin.so: .libs/libsflowPlugin.so@SO_VERSION_PATCH@
179 +sflowPlugin.so$(EXEEXT): .libs/libsflowPlugin.so@SO_VERSION_PATCH@
180 @ln -s .libs/libsflowPlugin.so sflowPlugin.so
182 .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@:
183 $(CC) -bundle -flat_namespace -undefined suppress -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ lastSeenPlugin.o
185 -lastSeenPlugin.so: .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@
186 +lastSeenPlugin.so$(EXEEXT): .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@
187 @ln -s .libs/liblastSeenPlugin.so lastSeenPlugin.so
189 .libs/libnfsPlugin.so@SO_VERSION_PATCH@:
190 $(CC) -bundle -flat_namespace -undefined suppress -o .libs/libnfsPlugin.so@SO_VERSION_PATCH@ nfsPlugin.o
192 -netflowPlugin.so: .libs/libnetflowPlugin.so@SO_VERSION_PATCH@
193 +netflowPlugin.so$(EXEEXT): .libs/libnetflowPlugin.so@SO_VERSION_PATCH@
194 @ln -s .libs/libnetflowPlugin.so netflowPlugin.so
196 .libs/libnetflowPlugin.so@SO_VERSION_PATCH@:
197 $(CC) -bundle -flat_namespace -undefined suppress -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ netflowPlugin.o
199 -nfsPlugin.so: .libs/libnfsPlugin.so@SO_VERSION_PATCH@
200 +nfsPlugin.so$(EXEEXT): .libs/libnfsPlugin.so@SO_VERSION_PATCH@
201 @ln -s .libs/libnfsPlugin.so nfsPlugin.so
203 #.libs/librmonPlugin.so@SO_VERSION_PATCH@:
204 diff -Nur ntop-current.orig/ntop/plugins/pep/Makefile.am ntop-current/ntop/plugins/pep/Makefile.am
205 --- ntop-current.orig/ntop/plugins/pep/Makefile.am Wed Jan 2 09:17:17 2002
206 +++ ntop-current/ntop/plugins/pep/Makefile.am Thu Oct 10 14:57:58 2002
212 +pep.so$(EXEEXT): pep.c
213 # ${CC} -shared ${libpep_la_OBJECTS} ${PEPLIBS} -Wl,-soname -Wl,libpep.so.0 -o pep.so
214 @${CC} -shared ${libpep_la_OBJECTS} ${PEPLIBS} -o pep.so
215 - (cd .. && ln -fs pep/pep.so .)
216 \ No newline at end of file
217 + (cd .. && ln -fs pep/pep.so .)