From 4a443bbf82adb1dbc2265129f6bcb9e6e57660bc Mon Sep 17 00:00:00 2001
From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Sun, 29 Sep 2019 09:58:10 +0200
Subject: [PATCH] configure: Add sar_dir configuration variable

This variable defines the directory where the sar binary command is
located.
This variable will be used in sa2 shell script.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---
 configure    | 18 ++++++++++++++++++
 configure.in | 12 ++++++++++++
 sa2.in       |  6 +++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index d894b3c..5ecf987 100755
--- a/configure
+++ b/configure
@@ -653,6 +653,8 @@ SYSCONFIG_FILE
 conf_file
 SYSCONFIG_DIR
 conf_dir
+SAR_DIR
+sar_dir
 SA_DIR
 sa_dir
 SA_LIB_DIR
@@ -765,6 +767,7 @@ CPP
 rcdir
 sa_lib_dir
 sa_dir
+sar_dir
 conf_dir
 conf_file
 history
@@ -1414,6 +1417,7 @@ Some influential environment variables:
   rcdir       run-commands directory
   sa_lib_dir  sadc directory
   sa_dir      system activity directory
+  sar_dir     sar directory
   conf_dir    sysstat configuration directory
   conf_file   sysstat configuration file
   history     number of daily data files to keep (default value is 7)
@@ -5057,6 +5061,7 @@ echo .
 #  rcdir         directory where startup scripts are installed
 #  sa_lib_dir    sadc, sa1 and sa2 directory
 #  sa_dir        system activity daily datafiles directory
+#  sar_dir       sar binary location. Used only in sa2 shell script
 #  conf_dir      sysstat configuration directory (default is /etc/sysconfig)
 #  conf_file     sysstat configuration file (default is sysstat)
 #  history       number of daily datafiles to keep (default value is 7)
@@ -5185,6 +5190,19 @@ if test ! -d $SA_DIR; then
 fi
 
 
+# sar binary location. Used only in sa2 shell script
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sar directory" >&5
+$as_echo_n "checking sar directory... " >&6; }
+
+if test x$sar_dir != x""; then
+   SAR_DIR=$sar_dir
+else
+   SAR_DIR=
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SAR_DIR" >&5
+$as_echo "$SAR_DIR" >&6; }
+
+
 # Set configuration directory
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sysstat configuration directory" >&5
 $as_echo_n "checking sysstat configuration directory... " >&6; }
diff --git a/configure.in b/configure.in
index 267a6bc..4e3eb62 100644
--- a/configure.in
+++ b/configure.in
@@ -184,6 +184,7 @@ echo .
 #  rcdir         directory where startup scripts are installed
 #  sa_lib_dir    sadc, sa1 and sa2 directory
 #  sa_dir        system activity daily datafiles directory
+#  sar_dir       sar binary location. Used only in sa2 shell script
 #  conf_dir      sysstat configuration directory (default is /etc/sysconfig)
 #  conf_file     sysstat configuration file (default is sysstat)
 #  history       number of daily datafiles to keep (default value is 7)
@@ -306,6 +307,17 @@ if test ! -d $SA_DIR; then
 fi
 AC_SUBST(SA_DIR)
 
+# sar binary location. Used only in sa2 shell script
+AC_MSG_CHECKING(sar directory)
+AC_ARG_VAR([sar_dir],[sar directory])
+if test x$sar_dir != x""; then
+   SAR_DIR=$sar_dir
+else
+   SAR_DIR=
+fi
+AC_MSG_RESULT($SAR_DIR)
+AC_SUBST(SAR_DIR)
+
 # Set configuration directory
 AC_MSG_CHECKING(sysstat configuration directory)
 AC_ARG_VAR([conf_dir],[sysstat configuration directory])
diff --git a/sa2.in b/sa2.in
index 38b05b4..98cfafa 100644
--- a/sa2.in
+++ b/sa2.in
@@ -15,6 +15,7 @@ HISTORY=@HISTORY@
 COMPRESSAFTER=@COMPRESSAFTER@
 ZIP="@ZIP@"
 UMASK=0022
+ENDIR=@SAR_DIR@
 
 # Read configuration file, overriding variables set above
 [ -r ${SYSCONFIG_DIR}/${SYSCONFIG_FILE} ] && . ${SYSCONFIG_DIR}/${SYSCONFIG_FILE}
@@ -42,7 +43,10 @@ CURRENTRPT=sar${DATE}
 
 RPT=${SA_DIR}/${CURRENTRPT}
 DFILE=${SA_DIR}/${CURRENTFILE}
-ENDIR=@bindir@
+if [ -z "${ENDIR}" ];
+then
+       ENDIR=@bindir@
+fi
 
 [ -f "${DFILE}" ] || exit 0
 cd ${ENDIR}
-- 
2.49.0