Remove isag support

isag (Interactive System Activity Grapher) is a script used to graph sar
data contributed by David Doubrava.
Though it is still included in sysstat package in the contrib directory,
it was no longer maintained and is now made deprecated by sadf and its
switch -g which can draw graphs in SVG format.
So remove all the options related to isag from Makefile and configure
scripts.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/Makefile.in b/Makefile.in
index e3c3b28ee7f1cb553904bbae6acda2228df454b6..0f56a4c1f31f8cd4b9aa1e6b41561a5789b1d382 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,9 +123,6 @@ endif
 ifndef COMPRESS_MANPG
 COMPRESS_MANPG = @COMPRESS_MANPG@
 endif
-ifndef INSTALL_ISAG
-INSTALL_ISAG = @INSTALL_ISAG@
-endif
 ifndef INSTALL_DOC
 INSTALL_DOC = @INSTALL_DOC@
 endif
@@ -317,9 +314,6 @@ ifeq ($(INSTALL_DOC),y)
        $(INSTALL_DATA) $(MANGRPARG) man/pidstat.1 $(DESTDIR)$(MAN1_DIR)
        rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1*
        $(INSTALL_DATA) $(MANGRPARG) man/cifsiostat.1 $(DESTDIR)$(MAN1_DIR)
-ifeq ($(INSTALL_ISAG),y)
-       $(INSTALL_DATA) $(MANGRPARG) contrib/isag/isag.1 $(DESTDIR)$(MAN1_DIR)
-endif
 ifeq ($(COMPRESS_MANPG),y)
        $(ZIP) $(DESTDIR)$(MAN8_DIR)/sa1.8
        $(ZIP) $(DESTDIR)$(MAN8_DIR)/sa2.8
@@ -332,9 +326,6 @@ ifeq ($(COMPRESS_MANPG),y)
        $(ZIP) $(DESTDIR)$(MAN1_DIR)/mpstat.1
        $(ZIP) $(DESTDIR)$(MAN1_DIR)/pidstat.1
        $(ZIP) $(DESTDIR)$(MAN1_DIR)/cifsiostat.1
-ifeq ($(INSTALL_ISAG),y)
-       $(ZIP) $(DESTDIR)$(MAN1_DIR)/isag.1
-endif
 endif
 endif
 
@@ -358,8 +349,7 @@ ifdef REQUIRE_NLS
        done
 endif
 
-install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \
-       contrib/isag/isag
+install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls
        mkdir -p $(DESTDIR)$(SA_LIB_DIR)
        mkdir -p $(DESTDIR)$(SA_DIR)
 ifeq ($(CLEAN_SA_DIR),y)
@@ -380,9 +370,6 @@ endif
        $(INSTALL_BIN) mpstat $(DESTDIR)$(BIN_DIR)
        $(INSTALL_BIN) pidstat $(DESTDIR)$(BIN_DIR)
        $(INSTALL_BIN) cifsiostat $(DESTDIR)$(BIN_DIR)
-ifeq ($(INSTALL_ISAG),y)
-       $(INSTALL_BIN) contrib/isag/isag $(DESTDIR)$(BIN_DIR)
-endif
        $(INSTALL_DATA) sysstat.ioconf $(DESTDIR)$(SYSCONFIG_DIR)
        $(INSTALL_DATA) sysstat.sysconfig $(DESTDIR)$(SYSCONFIG_DIR)/sysstat
 ifeq ($(INSTALL_DOC),y)
@@ -485,9 +472,6 @@ ifeq ($(INSTALL_DOC),y)
        rm -f $(DESTDIR)$(MAN1_DIR)/mpstat.1*
        rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1*
        rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1*
-ifeq ($(INSTALL_ISAG),y)
-       rm -f $(DESTDIR)$(MAN1_DIR)/isag.1
-endif
 endif
 
 uninstall_nls:
@@ -513,9 +497,6 @@ uninstall_base: uninstall_man uninstall_nls
        rm -f $(DESTDIR)$(BIN_DIR)/mpstat
        rm -f $(DESTDIR)$(BIN_DIR)/pidstat
        rm -f $(DESTDIR)$(BIN_DIR)/cifsiostat
-ifeq ($(INSTALL_ISAG),y)
-       rm -f $(DESTDIR)$(BIN_DIR)/isag
-endif
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(SA_LIB_DIR)
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(SA_DIR)/[0-9]?????
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(SA_DIR)
@@ -598,7 +579,6 @@ almost-distclean: clean nls/sysstat.pot
        rm -f sysstat.sysconfig cron/sysstat.crond cron/sysstat.cron.daily sysstat.service
        rm -f cron/sysstat-collect.service cron/sysstat-collect.timer cron/sysstat-summary.service cron/sysstat-summary.timer
        rm -f cron/sysstat.cron.hourly cron/sysstat.crond.sample cron/sysstat.crond.sample.in
-       rm -f contrib/isag/isag
        rm -f man/sa1.8 man/sa2.8 man/sadc.8 man/sadf.1 man/sar.1 man/iostat.1 man/sysstat.5
        rm -f man/cifsiostat.1
        rm -f *.log config.status

diff --git a/build/install-isag b/build/install-isag
deleted file mode 100644 (file)
index 43e2747..0000000
--- a/build/install-isag
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Answer y if you want to install the isag command.
-isag, the Interactive System Activity Grapher, is a graphical frontend
-to sar. It graphically displays the system activity data stored
-in a binary data file by a previous sar run.
-Although included in the sysstat package (in the contrib directory), isag is
-not necessarily kept in sync with sar. That's why it is not installed by default.
-

diff --git a/configure b/configure
index 93899de2324f90a3cee5873f33d1dad2cb93fcf0..13ccd5a3dc5275c9958726e48d5ecab4278801c0 100755 (executable)
--- a/configure
+++ b/configure
@@ -640,7 +640,6 @@ cron_interval
 cron_owner
 INSTALL_CRON
 CLEAN_SA_DIR
-INSTALL_ISAG
 COMPRESS_MANPG
 IGNORE_FILE_ATTRIBUTES
 MAN_GROUP
@@ -740,7 +739,6 @@ enable_largefile
 enable_nls
 enable_file_attr
 enable_compress_manpg
-enable_install_isag
 enable_clean_sa_dir
 enable_install_cron
 enable_collect_all
@@ -1383,7 +1381,6 @@ Optional Features:
   --disable-nls           disable National Language Support
   --disable-file-attr     do not set attributes on files being installed
   --enable-compress-manpg compress sysstat manual pages
-  --enable-install-isag   install isag script
   --enable-clean-sa-dir   clean system activity directory
   --enable-install-cron   install a crontab to start sar
   --enable-collect-all    collect all possible activities
@@ -4865,7 +4862,6 @@ echo .
 #  --collect-all           tell sadc to collect all possible data
 #  --enable-clean-sa-dir   clean system activity directory
 #  --enable-compress-manpg compress manual pages
-#  --enable-install-isag   install isag script
 #  --enable-debuginfo      enable debug output (--debuginfo option)
 #  --disable-documentation do not install documentation (man pages...)
 #  --disable-sensors      do not link against libsensors even if available
@@ -5167,26 +5163,6 @@ fi
 $as_echo "$AUX_MPG" >&6; }
 
 
-# Check whether isag should be installed
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether isag script should be installed" >&5
-$as_echo_n "checking whether isag script should be installed... " >&6; }
-# Check whether --enable-install-isag was given.
-if test "${enable_install_isag+set}" = set; then :
-  enableval=$enable_install_isag; AUX_IIS=$enableval
-else
-  AUX_IIS=no
-fi
-
-if test $AUX_IIS != "yes"; then
-   INSTALL_ISAG=n
-   AUX_IIS=no
-else
-   INSTALL_ISAG=y
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUX_IIS" >&5
-$as_echo "$AUX_IIS" >&6; }
-
-
 # Check whether sa directory should be cleaned
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system activity directory should be cleaned" >&5
 $as_echo_n "checking whether system activity directory should be cleaned... " >&6; }
@@ -5458,8 +5434,6 @@ ac_config_files="$ac_config_files man/iostat.1:man/iostat.in"
        # File must be renamed
 ac_config_files="$ac_config_files man/cifsiostat.1:man/cifsiostat.in"
        # File must be renamed
-ac_config_files="$ac_config_files contrib/isag/isag"
- # Permissions must be changed
 
 ac_config_files="$ac_config_files Makefile"
 
@@ -6193,7 +6167,6 @@ do
     "man/sysstat.5") CONFIG_FILES="$CONFIG_FILES man/sysstat.5:man/sysstat.in" ;;
     "man/iostat.1") CONFIG_FILES="$CONFIG_FILES man/iostat.1:man/iostat.in" ;;
     "man/cifsiostat.1") CONFIG_FILES="$CONFIG_FILES man/cifsiostat.1:man/cifsiostat.in" ;;
-    "contrib/isag/isag") CONFIG_FILES="$CONFIG_FILES contrib/isag/isag" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -6614,7 +6587,6 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
     "sa2":F) chmod +x sa2 ;;
     "cron/sysstat.crond.sample.in":F) sed s/^/#/ cron/sysstat.crond.sample.in > cron/sysstat.crond.sample ;;
     "sysstat":F) chmod +x sysstat ;;
-    "contrib/isag/isag":F) chmod +x contrib/isag/isag ;;
 
   esac
 done # for ac_tag

diff --git a/configure.in b/configure.in
index 68ffd740e47e4f54207e770f68589ba957e4873a..082ade5e5a78963606cf69432d9549f1f2d44deb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -137,7 +137,6 @@ echo .
 #  --collect-all           tell sadc to collect all possible data    
 #  --enable-clean-sa-dir   clean system activity directory
 #  --enable-compress-manpg compress manual pages
-#  --enable-install-isag   install isag script
 #  --enable-debuginfo      enable debug output (--debuginfo option)
 #  --disable-documentation do not install documentation (man pages...)
 #  --disable-sensors      do not link against libsensors even if available
@@ -406,21 +405,6 @@ fi
 AC_MSG_RESULT($AUX_MPG)
 AC_SUBST(COMPRESS_MANPG)
 
-# Check whether isag should be installed
-AC_MSG_CHECKING(whether isag script should be installed)
-AC_ARG_ENABLE(install-isag,
-             AC_HELP_STRING([--enable-install-isag],
-                            [install isag script]),
-                            AUX_IIS=$enableval,AUX_IIS=no)
-if test $AUX_IIS != "yes"; then
-   INSTALL_ISAG=n
-   AUX_IIS=no
-else
-   INSTALL_ISAG=y
-fi
-AC_MSG_RESULT($AUX_IIS)
-AC_SUBST(INSTALL_ISAG)
-
 # Check whether sa directory should be cleaned
 AC_MSG_CHECKING(whether system activity directory should be cleaned)
 AC_ARG_ENABLE(clean-sa-dir,
@@ -626,7 +610,6 @@ AC_CONFIG_FILES([man/sar.1:man/sar.in])             # File must be renamed
 AC_CONFIG_FILES([man/sysstat.5:man/sysstat.in])        # File must be renamed
 AC_CONFIG_FILES([man/iostat.1:man/iostat.in])  # File must be renamed
 AC_CONFIG_FILES([man/cifsiostat.1:man/cifsiostat.in])  # File must be renamed
-AC_CONFIG_FILES([contrib/isag/isag], [chmod +x contrib/isag/isag]) # Permissions must be changed
 
 AC_OUTPUT(Makefile)
 

diff --git a/iconfig b/iconfig
index e6afcdc1e93c50694f5a063fb8390adf7a86c470..6cb9519eeac88b35420e59b9a44cc8a0881dacdd 100755 (executable)
--- a/iconfig
+++ b/iconfig
@@ -191,15 +191,6 @@ else
        echo "Parameter --enable-debuginfo is NOT set"
 fi
 
-# Install isag script
-INSTALL_ISAG=`${ASK} 'Install isag script? (y/n)' "--enable-install-isag" "install-isag"`
-if [ "${INSTALL_ISAG}" = "y" ]; then
-       INSTALL_ISAG="--enable-install-isag "
-else
-       INSTALL_ISAG=""
-       echo "Parameter --enable-install-isag is NOT set"
-fi
-
 # Strip object files
 STRIP=`${ASK} 'Do not strip object files? (y/n)' "--disable-stripping" "stripping"`
 if [ "${STRIP}" = "y" ]; then
@@ -216,11 +207,11 @@ if [ "${SADC_OPT}" != "" ];
 then
        echo -n "sadc_options=\"${SADC_OPT}\""
 fi
-echo "${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${INSTALL_ISAG}${SENSORS}${STRIP}${COPY_ONLY}"
+echo "${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${SENSORS}${STRIP}${COPY_ONLY}"
 echo
 
 ./configure ${PREFIX}${SA_LIB_DIR}${SA_DIR}${SYSCONFIG_DIR}${CLEAN_SA_DIR}${NLS} \
 ${HISTORY}${COMPRESSAFTER}${PREALLOC_ANSWER}${MAN}${IGNORE_FILE_ATTR}${CRON}${RCDIR} \
-sadc_options="${SADC_OPT}" ${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${INSTALL_ISAG}${SENSORS} \
+sadc_options="${SADC_OPT}" ${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${SENSORS} \
 ${STRIP}${COPY_ONLY}