Add new sadc_options variable to configure script

Add a new variable (sadc_options) used by the configure script.
This option enables the user to enter parameters that will be passed to
sadc in the sa1 script. This can typically be used to select optional
activities that should be collected by sadc.

Signed-off-by: Sebastien GODARD <[email protected]>

Author: sysstat

build/sadc_options

@@ -0,0 +1,10 @@
+
+Options to be passed to sadc. This is typically used to tell sadc
+which optional activities should be collected.
+A possible answer here could be for example "-S DISK,POWER" (without
+the quotation marks) to tell sadc to collect data for block devices
+and power management statistics. Read sadc(8) manual page to know
+all the possible options accepted by sadc.
+You can also skip this question by pressing only the return key. In
+this case, sadc will collect only standard activities.
+

configure

@@ -634,6 +634,8 @@ CRON_INTERVAL
 SU_C_OWNER
 CRON_OWNER
 COPY_ONLY
+SADC_OPT
+sadc_options
 cron_interval
 cron_owner
 INSTALL_CRON
@@ -765,7 +767,8 @@ compressafter
 prealloc
 man_group
 cron_owner
-cron_interval'
+cron_interval
+sadc_options'
 
 
 # Initialize some variables set by options.
@@ -1419,6 +1422,8 @@ Some influential environment variables:
   cron_owner  crontab owner
   cron_interval
               crontab interval
+  sadc_options
+              options to be passed to sadc
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -4871,6 +4876,7 @@ echo .
 #  man_group     group for man pages
 #  cron_owner    crontab owner
 #  cron_interval crontab sampling interval
+#  sadc_options  options to be passed to sadc
 #
 # Fine tuning the installation directories:
 #  --mandir=DIR           man documentation directory [PREFIX/man]
@@ -5276,6 +5282,18 @@ fi
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUX_COLL" >&5
 $as_echo "$AUX_COLL" >&6; }
 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking options to be passed to sadc" >&5
+$as_echo_n "checking options to be passed to sadc... " >&6; }
+
+   if test x"$sadc_options" != x""; then
+	SADC_OPT="$sadc_options"
+   else
+	SADC_OPT=
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SADC_OPT" >&5
+$as_echo "$SADC_OPT" >&6; }
+
+
 # Check whether files should only be copied
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether files should only be copied" >&5
 $as_echo_n "checking whether files should only be copied... " >&6; }

configure.in

@@ -151,6 +151,7 @@ echo .
 #  man_group     group for man pages
 #  cron_owner    crontab owner
 #  cron_interval crontab sampling interval
+#  sadc_options  options to be passed to sadc
 #
 # Fine tuning the installation directories:
 #  --mandir=DIR           man documentation directory [PREFIX/man]
@@ -491,6 +492,16 @@ if test $INSTALL_CRON = "y"; then
    fi
    AC_MSG_RESULT($AUX_COLL)
 
+   AC_MSG_CHECKING(options to be passed to sadc)
+   AC_ARG_VAR([sadc_options],[options to be passed to sadc])
+   if test x"$sadc_options" != x""; then
+	SADC_OPT="$sadc_options"
+   else
+	SADC_OPT=
+   fi
+   AC_MSG_RESULT($SADC_OPT)
+   AC_SUBST(SADC_OPT)
+
 # Check whether files should only be copied
    AC_MSG_CHECKING(whether files should only be copied)
    AC_ARG_ENABLE(copy-only,

iconfig

@@ -144,6 +144,14 @@ then
 	fi
 fi
 
+if [ "${CRON}" != "" -a "${COLL_ALL}" != "y" ];
+then
+	# Optional args for sadc
+	SADC_OPT=`${ASK} 'Options to be passed to sadc:' "sadc_options" "sadc_options"`
+else
+	SADC_OPT=
+fi
+
 if [ "${CRON}" != "" ];
 then
 	# rc directory
@@ -211,12 +219,17 @@ else
 fi
 
 echo
-echo "./configure ${PREFIX}${SA_LIB_DIR}${SA_DIR}${SYSCONFIG_DIR}${CLEAN_SA_DIR}${NLS} \
-${YESTERDAY}${HISTORY}${COMPRESSAFTER}${PREALLOC_ANSWER}${MAN}${IGNORE_FILE_ATTR}${CRON}${RCDIR} \
-${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${INSTALL_ISAG}${SENSORS}${STRIP}${COPY_ONLY}"
+echo -n "./configure ${PREFIX}${SA_LIB_DIR}${SA_DIR}${SYSCONFIG_DIR}${CLEAN_SA_DIR}${NLS} \
+${YESTERDAY}${HISTORY}${COMPRESSAFTER}${PREALLOC_ANSWER}${MAN}${IGNORE_FILE_ATTR}${CRON}${RCDIR}"
+if [ "${SADC_OPT}" != "" ];
+then
+	echo -n "sadc_options=\"${SADC_OPT}\""
+fi
+echo "${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${INSTALL_ISAG}${SENSORS}${STRIP}${COPY_ONLY}"
 echo
 
 ./configure ${PREFIX}${SA_LIB_DIR}${SA_DIR}${SYSCONFIG_DIR}${CLEAN_SA_DIR}${NLS} \
 ${YESTERDAY}${HISTORY}${COMPRESSAFTER}${PREALLOC_ANSWER}${MAN}${IGNORE_FILE_ATTR}${CRON}${RCDIR} \
-${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${INSTALL_ISAG}${SENSORS}${STRIP}${COPY_ONLY}
+sadc_options="${SADC_OPT}" ${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${INSTALL_ISAG}${SENSORS} \
+${STRIP}${COPY_ONLY}
 

sysstat.sysconfig.in

@@ -10,7 +10,7 @@ COMPRESSAFTER=@COMPRESSAFTER@
 
 # Parameters for the system activity data collector (see sadc manual page)
 # which are used for the generation of log files.
-SADC_OPTIONS="@COLLECT_ALL@"
+SADC_OPTIONS="@COLLECT_ALL@ @SADC_OPT@"
 
 # Directory where sa and sar files are saved.
 SA_DIR=@SA_DIR@