From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 400 invoked by alias); 3 Jul 2008 04:11:31 -0000 Received: (qmail 369 invoked by uid 9702); 3 Jul 2008 04:11:31 -0000 Date: Thu, 03 Jul 2008 04:11:00 -0000 Message-ID: <20080703041131.354.qmail@sourceware.org> From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.05-43-ga66be49 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 2b9196e3fd4631ada6988ad2a084a9834e69674c X-Git-Newrev: a66be490568c86f1b4345407e20897d44a4f59c5 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00012.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a66be490568c86f1b4345407e20897d44a4f59c5 The branch, master has been updated via a66be490568c86f1b4345407e20897d44a4f59c5 (commit) from 2b9196e3fd4631ada6988ad2a084a9834e69674c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a66be490568c86f1b4345407e20897d44a4f59c5 Author: Fabio M. Di Nitto Date: Thu Jul 3 06:11:01 2008 +0200 [BUILD] Allow users to configure default built-in syslog level Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: configure | 7 +++++++ make/defines.mk.input | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 2a497e3..4d936af 100755 --- a/configure +++ b/configure @@ -72,6 +72,7 @@ my %options = ( docdir => \$docdir, logdir => \$logdir, syslogfacility => \$syslogfacility, + sysloglevel => \$sysloglevel, mibdir => \$mibdir, snmpbin => \$snmpbin, confdir => \$confdir, @@ -153,6 +154,7 @@ my $err = &GetOptions (\%options, 'docdir=s', 'logdir=s', 'syslogfacility=s', + 'sysloglevel=s', 'mibdir=s', 'snmpbin=s', 'confdir=s', @@ -198,6 +200,7 @@ if ($help || !$err) { print "--docdir=\tthe base directory for misc cluster documentation files. (Default: {prefix}/share/doc/cluster)\n"; print "--logdir=\tthe base directory for cluster logging files. (Default: /var/log/cluster/)\n"; print "--syslogfacility=\tset the default syslog facility. (Default: LOG_LOCAL4)\n"; + print "--sysloglevel=\tset the default syslog level. (Default: LOG_LEVEL_INFO)\n"; print "--mibdir=\tthe base directory for snmp mibs. (Default: {prefix}/share/snmp/mibs)\n"; print "--snmpbin=\tthe base directory for snmp binaries (Ex: /usr/bin/snmpwalk). (Default: {prefix}/bin)\n"; print "--confdir=\tthe cluster config directory. (Default: /etc/cluster)\n"; @@ -533,6 +536,9 @@ if (!$logdir) { if (!$syslogfacility) { $syslogfacility="LOG_LOCAL4"; } +if (!$sysloglevel) { + $sysloglevel="LOG_LEVEL_INFO"; +} if (!$mibdir) { $mibdir="${prefix}/share/snmp/mibs"; } @@ -692,6 +698,7 @@ while () { $_ =~ s/\@DOCDIR\@/$docdir/; $_ =~ s/\@LOGDIR\@/$logdir/; $_ =~ s/\@SYSLOGFACILITY\@/$syslogfacility/; + $_ =~ s/\@SYSLOGLEVEL\@/$sysloglevel/; $_ =~ s/\@MIBDIR\@/$mibdir/; $_ =~ s/\@SNMPBIN\@/$snmpbin/; $_ =~ s/\@CONFDIR\@/$confdir/; diff --git a/make/defines.mk.input b/make/defines.mk.input index 7b49131..4cb348e 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -21,7 +21,7 @@ RANLIB = ranlib CFLAGS += @CFLAGS@ -I@SRCDIR@/make CFLAGS += -DDEFAULT_CONFIG_DIR=\"@CONFDIR@\" -DDEFAULT_CONFIG_FILE=\"@CONFFILE@\" -CFLAGS += -DLOGDIR=\"@LOGDIR@\" -DSYSLOGFACILITY=@SYSLOGFACILITY@ +CFLAGS += -DLOGDIR=\"@LOGDIR@\" -DSYSLOGFACILITY=@SYSLOGFACILITY@ -DSYSLOGLEVEL=@SYSLOGLEVEL@ LDFLAGS += @LDFLAGS@ SRCDIR = @SRCDIR@ hooks/post-receive -- Cluster Project