Thread: [bwm-tools-devel] COMMIT - r39 - in trunk: . bwm_firewall bwm_graph bwm_monitor bwmd doc include lib
Brought to you by:
nkukard
Menu
▾
▴
bwm-tools-devel
|
[bwm-tools-devel] COMMIT - r39 - in trunk: . bwm_firewall bwm_graph bwm_monitor bwmd doc include lib
From: SVN C. <sv...@li...> - 2005-01-12 18:05:55
|
Author: nkukard
Date: 2005-01-12 20:05:22 +0200 (Wed, 12 Jan 2005)
New Revision: 39
Modified:
trunk/CREDITS
trunk/Makefile.am
trunk/Makefile.in
trunk/TODO
trunk/bwm_firewall/Makefile.in
trunk/bwm_graph/Makefile.am
trunk/bwm_graph/Makefile.in
trunk/bwm_graph/graph.c
trunk/bwm_graph/graph.h
trunk/bwm_monitor/Makefile.am
trunk/bwm_monitor/Makefile.in
trunk/bwm_monitor/bwm_monitor.c
trunk/bwm_monitor/display.c
trunk/bwm_monitor/display.h
trunk/bwmd/Makefile.am
trunk/bwmd/Makefile.in
trunk/bwmd/autoclass.c
trunk/bwmd/flow.c
trunk/bwmd/flowControl.c
trunk/bwmd/ipq.c
trunk/bwmd/logging.c
trunk/bwmd/report.c
trunk/configure
trunk/configure.ac
trunk/doc/Makefile.in
trunk/include/autoclass.h
trunk/include/common.h
trunk/include/flow.h
trunk/include/flowControl.h
trunk/include/ipq.h
trunk/include/misc.h
trunk/include/report.h
trunk/include/xmlConf.h
trunk/lib/Makefile.am
trunk/lib/Makefile.in
trunk/lib/misc.c
trunk/lib/xmlConf.c
Log:
* Updated copyright dates to 2005
* Added configure option --with-rrdtool-source, this option will build rrdtool and link BWM Tools statically
* Fixed glib detection bug in configure
* Fixed libxml detection bug in configure
* Fixed multiple entries in CREDITS file
* Updated TODO file
Modified: trunk/CREDITS
===================================================================
--- trunk/CREDITS 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/CREDITS 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,3 +1,6 @@
+Giang Hu <fre...@gm...>
+ - Various fixes and ideas
+ - Added --load command to bwm_firewall
Bruno Rodrigues <bdr...@st...>
- Requirements for Debian Stable 3.0
@@ -2,14 +5,2 @@
-Bruno Rodrigues <bdr...@st...>
- - Requirements for Debian Stable 3.0
-
-Bruno Rodrigues <bdr...@st...>
- - Requirements for Debian Stable 3.0
-
-Bruno Rodrigues <bdr...@st...>
- - Requirements for Debian Stable 3.0
-
-Bruno Rodrigues <bdr...@st...>
- - Requirements for Debian Stable 3.0
-
Patrick Ancillotti <pa...@xs...>
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/Makefile.am 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
#
# makefile.am - Makefile for BWM Tools
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-SUBDIRS=lib bwm_firewall bwm_graph bwmd bwm_monitor doc
+SUBDIRS=$(subdirs) lib bwm_firewall bwm_graph bwmd bwm_monitor doc
EXTRA_DIST=include/autoclass.h include/common.h include/flow.h include/flowControl.h include/ipq.h
EXTRA_DIST+=include/libipq.h include/misc.h include/report.h include/xmlConf.h
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/Makefile.in 2005-01-12 18:05:22 UTC (rev 39)
@@ -16,7 +16,7 @@
#
# makefile.am - Makefile for BWM Tools
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -196,9 +196,10 @@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = lib bwm_firewall bwm_graph bwmd bwm_monitor doc
+SUBDIRS = $(subdirs) lib bwm_firewall bwm_graph bwmd bwm_monitor doc
EXTRA_DIST = include/autoclass.h include/common.h include/flow.h \
include/flowControl.h include/ipq.h include/libipq.h \
include/misc.h include/report.h include/xmlConf.h
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/TODO 2005-01-12 18:05:22 UTC (rev 39)
@@ -15,7 +15,5 @@
* Add menu to bwm_monitor to which IP it wants to connect to, authentication aswell and default
to localhost
* bwm_firewall to generate automatic MARK values for flows
-* fix parseDateTime, this is the messiest function!
* fix findFlowByName & findGroupByName, these 2 functions are similar and i'm sure can be merged
* have the location of iptables-restore automatically discovered using ./configure, with override options
-* make bwm_firewall able to reload the firewall into kernel using iptables-restore
Modified: trunk/bwm_firewall/Makefile.in
===================================================================
--- trunk/bwm_firewall/Makefile.in 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_firewall/Makefile.in 2005-01-12 18:05:22 UTC (rev 39)
@@ -194,6 +194,7 @@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = bwm_firewall.h
Modified: trunk/bwm_graph/Makefile.am
===================================================================
--- trunk/bwm_graph/Makefile.am 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_graph/Makefile.am 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
#
# makefile.am - Makefile for BWM Graph
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/bwm_graph/Makefile.in
===================================================================
--- trunk/bwm_graph/Makefile.in 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_graph/Makefile.in 2005-01-12 18:05:22 UTC (rev 39)
@@ -16,7 +16,7 @@
#
# makefile.am - Makefile for BWM Graph
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -195,6 +195,7 @@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = graph.h
Modified: trunk/bwm_graph/graph.c
===================================================================
--- trunk/bwm_graph/graph.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_graph/graph.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* graph.c - BWM Graph functions
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/bwm_graph/graph.h
===================================================================
--- trunk/bwm_graph/graph.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_graph/graph.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* graph.c - BWM Graph functions header file
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/bwm_monitor/Makefile.am
===================================================================
--- trunk/bwm_monitor/Makefile.am 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_monitor/Makefile.am 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
#
# makefile.am - Makefile for BWM Monitor
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/bwm_monitor/Makefile.in
===================================================================
--- trunk/bwm_monitor/Makefile.in 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_monitor/Makefile.in 2005-01-12 18:05:22 UTC (rev 39)
@@ -16,7 +16,7 @@
#
# makefile.am - Makefile for BWM Monitor
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -195,6 +195,7 @@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = display.h
Modified: trunk/bwm_monitor/bwm_monitor.c
===================================================================
--- trunk/bwm_monitor/bwm_monitor.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_monitor/bwm_monitor.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* bwm_monitor.c - BWM Monitor
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -312,7 +312,7 @@
// Set our main screen
wbkgdset(w_main, COLOR_PAIR(2) | ' ');
fill_window(w_main);
- windowTitle(w_main,3,2,0,2,"BWM Monitor v"PACKAGE_VERSION" - Copyright (c) 2003-2004 Linux Based Systems Design");
+ windowTitle(w_main,3,2,0,2,"BWM Monitor v"PACKAGE_VERSION" - Copyright (c) 2003-2005 Linux Based Systems Design");
refresh();
Modified: trunk/bwm_monitor/display.c
===================================================================
--- trunk/bwm_monitor/display.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_monitor/display.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* display.c - Curses stuff for BWM Monitor
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/bwm_monitor/display.h
===================================================================
--- trunk/bwm_monitor/display.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwm_monitor/display.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* display.h - Curses stuff for BWM Monitor header file
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/bwmd/Makefile.am
===================================================================
--- trunk/bwmd/Makefile.am 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwmd/Makefile.am 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
#
# makefile.am - Makefile for BWM Daemon
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/bwmd/Makefile.in
===================================================================
--- trunk/bwmd/Makefile.in 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwmd/Makefile.in 2005-01-12 18:05:22 UTC (rev 39)
@@ -16,7 +16,7 @@
#
# makefile.am - Makefile for BWM Daemon
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -197,6 +197,7 @@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
CONFIG_DIR = /etc/bwm_tools
Modified: trunk/bwmd/autoclass.c
===================================================================
--- trunk/bwmd/autoclass.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwmd/autoclass.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* autoclass.c - Automatic packet priority classification
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/bwmd/flow.c
===================================================================
--- trunk/bwmd/flow.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwmd/flow.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* flow.c - Flow handling for bwmd
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/bwmd/flowControl.c
===================================================================
--- trunk/bwmd/flowControl.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwmd/flowControl.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* flowControl.c - Backend <-> Frontend control
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/bwmd/ipq.c
===================================================================
--- trunk/bwmd/ipq.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwmd/ipq.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* ipq.c - IPQ handling for bwmd
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/bwmd/logging.c
===================================================================
--- trunk/bwmd/logging.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwmd/logging.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* logging.c - Logging support for bwmd
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/bwmd/report.c
===================================================================
--- trunk/bwmd/report.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/bwmd/report.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* flowControl.c - BWM Daemon reporting stuff
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/configure
===================================================================
--- trunk/configure 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/configure 2005-01-12 18:05:22 UTC (rev 39)
@@ -463,7 +463,8 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RRDTOOL_LIBS AL!
LOCA LIBOBJS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS XML2_CONFIG XML_CPPFLAGS XML_LIBS XML_CFLAGS LTLIBOBJS'
+ac_subdirs_all="$ac_subdirs_all rrdtool"
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL subdirs RRDTOOL!
_LIBS ALLOCA LIBOBJS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS XML2_CONFIG XML_CPPFLAGS XML_LIBS XML_CFLAGS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1045,6 +1046,7 @@
both]
--with-tags[=TAGS]
include additional configurations [automatic]
+ --with-rrdtool-source Specify directory where rrdtool sources are
--with-xml-prefix=PFX Prefix where libxml is installed (optional)
--with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)
@@ -3752,7 +3754,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3755 "configure"' > conftest.$ac_ext
+ echo '#line 3757 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5324,7 +5326,7 @@
# Provide some information about the compiler.
-echo "$as_me:5327:" \
+echo "$as_me:5329:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6358,11 +6360,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6361: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6363: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6365: \$? = $ac_status" >&5
+ echo "$as_me:6367: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6591,11 +6593,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6594: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6596: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6598: \$? = $ac_status" >&5
+ echo "$as_me:6600: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6651,11 +6653,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6654: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6656: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6658: \$? = $ac_status" >&5
+ echo "$as_me:6660: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8835,7 +8837,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8838 "configure"
+#line 8840 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8933,7 +8935,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8936 "configure"
+#line 8938 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11112,11 +11114,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11115: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11117: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11119: \$? = $ac_status" >&5
+ echo "$as_me:11121: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11172,11 +11174,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11175: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11177: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11179: \$? = $ac_status" >&5
+ echo "$as_me:11181: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12533,7 +12535,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12536 "configure"
+#line 12538 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12631,7 +12633,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12634 "configure"
+#line 12636 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13458,11 +13460,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13461: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13463: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13465: \$? = $ac_status" >&5
+ echo "$as_me:13467: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13518,11 +13520,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13521: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13523: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13525: \$? = $ac_status" >&5
+ echo "$as_me:13527: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15552,11 +15554,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15555: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15557: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15559: \$? = $ac_status" >&5
+ echo "$as_me:15561: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15785,11 +15787,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15788: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15790: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15792: \$? = $ac_status" >&5
+ echo "$as_me:15794: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15845,11 +15847,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15848: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15850: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15852: \$? = $ac_status" >&5
+ echo "$as_me:15854: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18029,7 +18031,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18032 "configure"
+#line 18034 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18127,7 +18129,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18130 "configure"
+#line 18132 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19486,13 +19488,26 @@
fi
-echo "$as_me:$LINENO: checking for rrd_create in -lrrd" >&5
+
+# Check whether --with-rrdtool-source or --without-rrdtool-source was given.
+if test "${with_rrdtool_source+set}" = set; then
+ withval="$with_rrdtool_source"
+
+
+
+subdirs="$subdirs rrdtool"
+
+ RRDTOOL_LIBS="$top_builddir/rrdtool/src/.libs/librrdtool.a"
+
+else
+
+ echo "$as_me:$LINENO: checking for rrd_create in -lrrd" >&5
echo $ECHO_N "checking for rrd_create in -lrrd... $ECHO_C" >&6
if test "${ac_cv_lib_rrd_rrd_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrrd $LIBS"
+LIBS="-lrrd "-lm" $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19554,90 +19569,25 @@
have_librrd=yes
fi
-if test x"$have_librrd" = x
-then
- echo "$as_me:$LINENO: checking for rrd_update in -lrrd" >&5
-echo $ECHO_N "checking for rrd_update in -lrrd... $ECHO_C" >&6
-if test "${ac_cv_lib_rrd_rrd_update+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrrd "-lm" $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char rrd_update ();
-int
-main ()
-{
-rrd_update ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_rrd_rrd_update=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_rrd_rrd_update=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_rrd_rrd_update" >&5
-echo "${ECHO_T}$ac_cv_lib_rrd_rrd_update" >&6
-if test $ac_cv_lib_rrd_rrd_update = yes; then
- have_librrd=yes
-fi
-
if test x"$have_librrd" = x
then
echo
+ echo "* - ERROR -"
echo "* You need the development libraries and headers"
echo "* for rrdtool. Normally you can download a"
echo "* package called rrdtool-devel for your"
echo "* distribution, install it and everything should"
echo "* be fine"
+ echo "*"
+ echo "* Alternatively, follow these instructions..."
+ echo "* 1. Download, uncompress and extract rrdtool to the top BWM Tools directory"
+ echo "* 2. Symlink it, like this -> ln -s rrdtool-x.x.x rrdtool"
+ echo "* 3. Re-run ./configure with -> --with-rrdtool-source"
exit 1
fi
- RRDTOOL_LIBS="-lm"
-fi
-RRDTOOL_LIBS="$RRDTOOL_LIBS -lrrd"
+ RRDTOOL_LIBS="-lm -lrrd"
+fi;
# Checks for header files.
@@ -22803,7 +22753,7 @@
done
-# Custom
+# Check for glib 2.4.0
# Check whether --enable-glibtest or --disable-glibtest was given.
if test "${enable_glibtest+set}" = set; then
enableval="$enable_glibtest"
@@ -23123,8 +23073,17 @@
rm -f conf.glibtest
+if test x"$have_glib" = x"no"
+then
+ echo
+ echo "* - ERROR -"
+ echo "* glib >= 2.4.0 required, this includes the development libraries and headers"
+ exit 1
+fi
+# Check for libxml 2.6.0
+
# Check whether --with-xml-prefix or --without-xml-prefix was given.
if test "${with_xml_prefix+set}" = set; then
withval="$with_xml_prefix"
@@ -23427,9 +23386,18 @@
rm -f conf.xmltest
+if test x"$have_xml" = x"no"
+then
+ echo
+ echo "* - ERROR -"
+ echo "* libxml >= 2.6.0 required, this includes the development libraries and headers"
+ exit 1
+fi
+
XML_CFLAGS=$XML_CPPFLAGS
+
ac_config_files="$ac_config_files Makefile lib/Makefile bwm_firewall/Makefile bwm_graph/Makefile bwmd/Makefile bwm_monitor/Makefile doc/Makefile"
cat >confcache <<\_ACEOF
@@ -24147,6 +24115,7 @@
s,@FFLAGS@,$FFLAGS,;t t
s,@ac_ct_F77@,$ac_ct_F77,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
+s,@subdirs@,$subdirs,;t t
s,@RRDTOOL_LIBS@,$RRDTOOL_LIBS,;t t
s,@ALLOCA@,$ALLOCA,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
@@ -24876,3 +24845,180 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
+#
+# CONFIG_SUBDIRS section.
+#
+if test "$no_recursion" != yes; then
+
+ # Remove --cache-file and --srcdir arguments so they do not pile up.
+ ac_sub_configure_args=
+ ac_prev=
+ for ac_arg in $ac_configure_args; do
+ if test -n "$ac_prev"; then
+ ac_prev=
+ continue
+ fi
+ case $ac_arg in
+ -cache-file | --cache-file | --cache-fil | --cache-fi \
+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+ ac_prev=cache_file ;;
+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
+ | --c=*)
+ ;;
+ --config-cache | -C)
+ ;;
+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+ ac_prev=srcdir ;;
+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+ ;;
+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+ ac_prev=prefix ;;
+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+ ;;
+ *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+ esac
+ done
+
+ # Always prepend --prefix to ensure using the same prefix
+ # in subdir configurations.
+ ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
+
+ ac_popdir=`pwd`
+ for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
+
+ # Do not complain, so a configure script can configure whichever
+ # parts of a large source tree are present.
+ test -d $srcdir/$ac_dir || continue
+
+ { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
+echo "$as_me: configuring in $ac_dir" >&6;}
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir="$ac_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
+
+ ac_builddir=.
+
+if test "$ac_dir" != .; then
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_srcdir=.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
+
+ cd $ac_dir
+
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_srcdir/configure.gnu; then
+ ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
+ elif test -f $ac_srcdir/configure; then
+ ac_sub_configure="$SHELL '$ac_srcdir/configure'"
+ elif test -f $ac_srcdir/configure.in; then
+ ac_sub_configure=$ac_configure
+ else
+ { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+ ac_sub_configure=
+ fi
+
+ # The recursion is here.
+ if test -n "$ac_sub_configure"; then
+ # Make the cache file name correct relative to the subdirectory.
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
+ *) # Relative path.
+ ac_sub_cache_file=$ac_top_builddir$cache_file ;;
+ esac
+
+ { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+ # The eval makes quoting arguments work.
+ eval $ac_sub_configure $ac_sub_configure_args \
+ --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
+ { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ cd $ac_popdir
+ done
+fi
+
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/configure.ac 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* configure.ac - Configure macro file for BWM Tools
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -42,26 +42,34 @@
AC_CHECK_LIB([ncurses], [curses_version])
AC_CHECK_LIB([panel], [panel_window])
-AC_CHECK_LIB([rrd], [rrd_create],have_librrd=yes)
-if test x"$have_librrd" = x
-then
- AC_CHECK_LIB([rrd], [rrd_update],have_librrd=yes,,"-lm")
+AC_ARG_WITH([rrdtool-source],
+ [ --with-rrdtool-source Specify directory where rrdtool sources are],
+ [
+ AC_CONFIG_SUBDIRS(rrdtool)
+ RRDTOOL_LIBS="$top_builddir/rrdtool/src/.libs/librrdtool.a"
+ ],
+ [
+ AC_CHECK_LIB([rrd], [rrd_create],have_librrd=yes,,"-lm")
if test x"$have_librrd" = x
then
echo
+ echo "* - ERROR -"
echo "* You need the development libraries and headers"
echo "* for rrdtool. Normally you can download a"
echo "* package called rrdtool-devel for your"
echo "* distribution, install it and everything should"
echo "* be fine"
+ echo "*"
+ echo "* Alternatively, follow these instructions..."
+ echo "* 1. Download, uncompress and extract rrdtool to the top BWM Tools directory"
+ echo "* 2. Symlink it, like this -> ln -s rrdtool-x.x.x rrdtool"
+ echo "* 3. Re-run ./configure with -> --with-rrdtool-source"
exit 1
fi
- RRDTOOL_LIBS="-lm"
-fi
-RRDTOOL_LIBS="$RRDTOOL_LIBS -lrrd"
+ RRDTOOL_LIBS="-lm -lrrd"
+ ])
AC_SUBST(RRDTOOL_LIBS)
-
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
@@ -87,12 +95,30 @@
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([gettimeofday inet_ntoa memset select socket strcasecmp strchr strdup strerror strncasecmp strndup])
-# Custom
+# Check for glib 2.4.0
AM_PATH_GLIB_2_0(2.4.0,have_glib=yes,have_glib=no,gthread)
+if test x"$have_glib" = x"no"
+then
+ echo
+ echo "* - ERROR -"
+ echo "* glib >= 2.4.0 required, this includes the development libraries and headers"
+ exit 1
+fi
+
+# Check for libxml 2.6.0
AM_PATH_XML2(2.6.0,have_xml=yes,have_xml=no)
+if test x"$have_xml" = x"no"
+then
+ echo
+ echo "* - ERROR -"
+ echo "* libxml >= 2.6.0 required, this includes the development libraries and headers"
+ exit 1
+fi
+
XML_CFLAGS=$XML_CPPFLAGS
AC_SUBST(XML_CFLAGS)
+
AC_CONFIG_FILES([
Makefile
lib/Makefile
Modified: trunk/doc/Makefile.in
===================================================================
--- trunk/doc/Makefile.in 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/doc/Makefile.in 2005-01-12 18:05:22 UTC (rev 39)
@@ -186,6 +186,7 @@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = Configuration Install example.xml fdl.texi
Modified: trunk/include/autoclass.h
===================================================================
--- trunk/include/autoclass.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/include/autoclass.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* autoclass.h - Automatic packet priority classification header file
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/include/common.h
===================================================================
--- trunk/include/common.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/include/common.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* common.h - Header stuff commonly used by more than 1 .c file
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/include/flow.h
===================================================================
--- trunk/include/flow.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/include/flow.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* flow.h - Headerfile for bwmd
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/include/flowControl.h
===================================================================
--- trunk/include/flowControl.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/include/flowControl.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* flowControl.h - Control interface stuff
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/include/ipq.h
===================================================================
--- trunk/include/ipq.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/include/ipq.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* ipq.h - IPQ header file for bwmd
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/include/misc.h
===================================================================
--- trunk/include/misc.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/include/misc.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* misc.h - Misc functions header file
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/include/report.h
===================================================================
--- trunk/include/report.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/include/report.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* report.h - Reporting header file for bwmd
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/include/xmlConf.h
===================================================================
--- trunk/include/xmlConf.h 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/include/xmlConf.h 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* xmlConf.h - Header stuff for our xml config library
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/lib/Makefile.am
===================================================================
--- trunk/lib/Makefile.am 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/lib/Makefile.am 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
#
# makefile.am - Makefile for the BWM library
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Modified: trunk/lib/Makefile.in
===================================================================
--- trunk/lib/Makefile.in 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/lib/Makefile.in 2005-01-12 18:05:22 UTC (rev 39)
@@ -16,7 +16,7 @@
#
# makefile.am - Makefile for the BWM library
-# Copyright (C) 2003-2004, Linux Based Systems Design
+# Copyright (C) 2003-2005, Linux Based Systems Design
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -199,6 +199,7 @@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
lib_LTLIBRARIES = libbwm.la
Modified: trunk/lib/misc.c
===================================================================
--- trunk/lib/misc.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/lib/misc.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* misc.c - Misc functions we can use
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/lib/xmlConf.c
===================================================================
--- trunk/lib/xmlConf.c 2005-01-10 17:00:29 UTC (rev 38)
+++ trunk/lib/xmlConf.c 2005-01-12 18:05:22 UTC (rev 39)
@@ -1,6 +1,6 @@
/*
* xmlConf.c - XML config file stuff
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X