[Orca-checkins] rev 183 - in trunk/orca: . orcallator

blair at orcaware.com blair at orcaware.com
Fri Jan 3 17:47:34 PST 2003


Author: blair
Date: 2003-01-03 17:47:23 -0800 (Fri, 03 Jan 2003)
New Revision: 183

Modified:
   trunk/orca/INSTALL
   trunk/orca/configure.in
   trunk/orca/orcallator/orcallator.cfg.in
Log:
Given that there will be more key Orca configuration files beyond
orcallator.cfg, in particular procallator.cfg, that will need to be
configured, start to place some of the customization options into
configure so common settings can be applied to multiple Orca
configuration files.

This first one adds a new configure option --with-warn-email which is
used to set Orca's warn_email configuration file in orcallator.cfg.

* configure.in:
  New --with-warn-email command line option which sets WARN_EMAIL.
    Defaults to `root at localhost' if not set.
  Comment out setting $ALWAYS_BUILD_PERL_MODULES so that it can be set
    in the environment and be used to build all of the Perl modules.

* orcallator/orcallator.cfg.in:
  Replace `root at localhost' with @WARN_EMAIL@ to the replaced by
  config.status.

* INSTALL (Configure Orca):
  Break this section into smaller subsections, where each subsection
  describes a related group of configure command line options.  Add a
  description of --with-warn-email.


Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in	(original)
+++ trunk/orca/configure.in	2003-01-03 17:47:32.000000000 -0800
@@ -19,8 +19,8 @@
 # Set this to yes to have configure always build all of the required
 # Perl Orca modules.  This is used to test the build more than
 # anything else.
-ALWAYS_BUILD_PERL_MODULES=yes
-ALWAYS_BUILD_PERL_MODULES=
+# ALWAYS_BUILD_PERL_MODULES=yes
+# ALWAYS_BUILD_PERL_MODULES=
 
 # Define the directories containing packages that Orca makes use of here.
 # The directory name packages where these packages are distributed with
@@ -181,6 +181,21 @@
 AC_SUBST(WATCH_WEB)
 AC_SUBST(WEB_LOG)
 
+AC_ARG_WITH(warn-email,
+  [  --with-warn-email=ADDR  email address to send warnings to [[root at localhost]]],
+  [
+    case "$withval" in
+      "" | y | ye | yes | n | no)
+         AC_MSG_ERROR([*** You must supply an argument to the --with-warn-email option.])
+         ;;
+      *) WARN_EMAIL="$withval"
+         ;;
+    esac
+  ],
+  : ${WARN_EMAIL=root at localhost}
+)
+AC_SUBST(WARN_EMAIL)
+
 # To get a default CFLAGS for this build, check for a C compiler.  This
 # is also needed to be ready to compile any Perl modules.
 AC_PROG_CC

Modified: trunk/orca/orcallator/orcallator.cfg.in
==============================================================================
--- trunk/orca/orcallator/orcallator.cfg.in	(original)
+++ trunk/orca/orcallator/orcallator.cfg.in	2003-01-03 17:47:32.000000000 -0800
@@ -38,7 +38,7 @@
 # being updated constantly stops being updated.  For mathematical
 # expressions use the word `interval' to get the interval number for
 # the data source.
-warn_email		root at localhost
+warn_email		@WARN_EMAIL@
 late_interval		interval + 30
 
 # These parameters specify which plots to generate.

Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL	(original)
+++ trunk/orca/INSTALL	2003-01-03 17:47:32.000000000 -0800
@@ -96,32 +96,50 @@
 
  3) Configure Orca.
 
-    Now that you have decided where the RRD, HTML, and optionally the
-    orcallator data files and the web server access logs, are located,
-    run the configure script with the following arguments:
-
-    % ./configure --prefix=ORCA_PREFIX_DIRECTORY    \
-                  --with-var-dir=VAR_DIR_LOCATION   \
-                  --with-rrd-dir=RRD_DIR_LOCATION   \
-                  --with-html-dir=HTML_DIR_LOCATION \
-                  --with-TYPE-log=LOG_LOCATION
-
-    If you choose nothing else, the --with-html-dir must always be
-    used, otherwise configure will fail.
-
-    If you use a web, proxy, or Squid server, you can have orcallator
-    gather statistics from the log file.  Use this table to decide
-    which configure option to use.  Note that the Apache and NCSA
-    servers use the Common Log Format.
-
-    Log Type                                   Configure Option
-    ----------------------------------------------------------------
-    Common Log Format                          --with-ncsa-log=FILE
-    Common Log Format with Proxy Information   --with-proxy-log=FILE
-    Squid Log Format                           --with-squid-log=FILE
-
-    Configure will let you use only one of these --with-TYPE-log
-    options.
+    --prefix=DIR
+    --with-var-dir=DIR
+    --with-rrd-dir=DIR
+    --with-html-dir=DIR
+
+       Now that you have decided where the RRD, HTML, and optionally
+       the orcallator data files and the web server access logs, are
+       located, the configure script can be passed the following
+       arguments:
+
+          --prefix=ORCA_PREFIX_DIRECTORY
+          --with-var-dir=VAR_DIR_LOCATION
+          --with-rrd-dir=RRD_DIR_LOCATION
+          --with-html-dir=HTML_DIR_LOCATION
+
+       If you choose nothing else, the --with-html-dir must always be
+       used, otherwise configure will fail.
+
+    --with-ncsa-log=LOG_FILENAME
+    --with-proxy-log=LOG_FILENAME
+    --with-squid-log=LOG_FILENAME
+
+       If you use a web, proxy, or Squid server, you can have
+       orcallator gather statistics from the log file.  Use this table
+       to determine the appropriate configure command line option to
+       use.  LOG_FILENAME should be the location of the log file to
+       monitor.  Note that Apache and NCSA servers use the Common Log
+       Format.
+
+       Log Type                                   Configure Option
+       -----------------------------------------------------------
+       Common Log Format                          --with-ncsa-log
+       Common Log Format with Proxy Information   --with-proxy-log
+       Squid Log Format                           --with-squid-log
+
+       Configure will let you use only one of these options.
+
+    --with-warn-email
+
+       Orca has a `warn_email' configuration setting which is set to
+       an email address where Orca should send its warning messages.
+       By default this address is `root at localhost'.  You can use this
+       configure option to change the default email address to use in
+       the Orca configuration scripts in this distribution.
 
     The configure script will find where your version of Perl and some
     other assorted programs are located.  It will also determine if



More information about the Orca-checkins mailing list