projects / packages / ntop.git / blame
| Commit | Line | Data |
|---|---|---|
| fc11cb73 JB |
1 | --- ntop-2.2.95/plugins/Makefile.am.orig Tue Jul 29 22:28:46 2003 |
| 2 | +++ ntop-2.2.95/plugins/Makefile.am Fri Dec 12 11:31:00 2003 | |
| 3 | @@ -59,7 +59,7 @@ | |
| 4 | ||
| 5 | librrdPlugin_la_SOURCES = rrdPlugin.c | |
| 6 | librrdPlugin_la_LDFLAGS = -shared -release @PACKAGE_VERSION@ @DYN_FLAGS@ | |
| 7 | -librrdPlugin_la_LIBADD = -L../myrrd -lmyrrd | |
| 8 | +librrdPlugin_la_LIBADD = -lrrd | |
| 9 | ||
| 10 | libpdaPlugin_la_SOURCES = pdaPlugin.c | |
| 11 | libpdaPlugin_la_LDFLAGS = -shared -release @PACKAGE_VERSION@ @DYN_FLAGS@ | |
| 12 | --- ntop-2.2.95/plugins/rrdPlugin.c.orig Tue Sep 23 17:03:12 2003 | |
| 13 | +++ ntop-2.2.95/plugins/rrdPlugin.c Fri Dec 12 11:32:12 2003 | |
| 14 | @@ -21,6 +21,7 @@ | |
| 15 | /* This plugin works only with threads */ | |
| 16 | ||
| 17 | /* #define RRD_DEBUG 8 */ | |
| 18 | +#define HAVE_RRD_ABERRANT_BEHAVIOR | |
| 19 | ||
| 20 | /* | |
| 21 | ||
| 22 | @@ -493,7 +494,7 @@ | |
| 23 | ||
| 24 | fillupArgv(argc, sizeof(argv)/sizeof(char*), argv); | |
| 25 | rrd_clear_error(); | |
| 26 | - rc = rrd_graph(argc, argv, &calcpr, &x, &y); | |
| 27 | + rc = rrd_graph(argc, argv, &calcpr, &x, &y, NULL); | |
| 28 | ||
| 29 | calfree(); | |
| 30 | ||
| 31 | --- ntop-2.2.95/Makefile.am.orig Fri Sep 12 00:54:51 2003 | |
| 32 | +++ ntop-2.2.95/Makefile.am Fri Dec 12 11:27:03 2003 | |
| 33 | @@ -59,7 +59,7 @@ | |
| 34 | stamp-h.in | |
| 35 | ||
| 36 | ||
| 37 | -SUBDIRS = myrrd . @PLUGINS@ | |
| 38 | +SUBDIRS = . @PLUGINS@ | |
| 39 | ||
| 40 | ETTER_PASSIVE_DOWNLOAD = etter.passive.os.fp | |
| 41 | ETTER_PASSIVE = $(ETTER_PASSIVE_DOWNLOAD).gz | |
| 42 | @@ -155,7 +155,7 @@ | |
| 43 | traffic.c vendor.c version.c \ | |
| 44 | ntop_darwin.c | |
| 45 | ||
| 46 | -libntop_la_DEPENDENCIES = myrrd/libmyrrd.a config.h | |
| 47 | +libntop_la_DEPENDENCIES = config.h | |
| 48 | libntop_la_LIBADD = | |
| 49 | libntop_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@ | |
| 50 | ||
| 51 | @@ -166,15 +166,12 @@ | |
| 52 | webInterface.c xmldump.c | |
| 53 | ||
| 54 | ||
| 55 | -libntopreport_la_DEPENDENCIES = myrrd/libmyrrd.a config.h | |
| 56 | +libntopreport_la_DEPENDENCIES = config.h | |
| 57 | libntopreport_la_LIBADD = | |
| 58 | libntopreport_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@ | |
| 59 | ||
| 60 | man_MANS = ntop.8 | |
| 61 | ||
| 62 | -myrrd/libmyrrd.a: | |
| 63 | - cd myrrd; make | |
| 64 | - | |
| 65 | # | |
| 66 | # Special stuff for xml auto-generation of code from the "doc": | |
| 67 | # | |
| 68 | --- ntop-2.2.95/configure.in.orig Tue Sep 23 17:35:05 2003 | |
| 69 | +++ ntop-2.2.95/configure.in Fri Dec 12 11:29:11 2003 | |
| 70 | @@ -128,7 +128,7 @@ | |
| 71 | AC_PREFIX_DEFAULT(${NTOPDIR:-/usr/local}) | |
| 72 | ||
| 73 | # Set constants and defaults | |
| 74 | -MYRRD=`pwd`/myrrd | |
| 75 | + | |
| 76 | SO_VERSION_PATCH= | |
| 77 | ||
| 78 | AS= | |
| 79 | @@ -2868,9 +2868,6 @@ | |
| 80 | AC_DEFINE_UNQUOTED(CFG_DBFILE_DIR,"$CFG_DBFILE_DIR", [Database file directory]) | |
| 81 | echo " Database files are in $CFG_DBFILE_DIR" | |
| 82 | ||
| 83 | -dnl> Append RRD finally | |
| 84 | -NTOP_APPENDS([${MYRRD}], [${MYRRD}], [myrrd]) | |
| 85 | - | |
| 86 | echo | |
| 87 | echo "-------------------------------------------------------------------" | |
| 88 | echo | |
| 89 | @@ -2898,7 +2895,6 @@ | |
| 90 | AC_SUBST(SO_VERSION_PATCH) | |
| 91 | ||
| 92 | AC_CONFIG_FILES([Makefile]) | |
| 93 | -AC_CONFIG_FILES([myrrd/Makefile]) | |
| 94 | ||
| 95 | if test ".${ac_disable_plugins}" != ".yes"; then | |
| 96 | AC_CONFIG_FILES([plugins/Makefile]) |