[Darshan-commits] [Darshan] branch, master, updated. darshan-2.3.1-1-g7272638

Service Account git at mcs.anl.gov
Wed Apr 29 09:59:38 CDT 2015


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 "".

The branch, master has been updated
       via  7272638723031ecbdaa9d898e499647293c11b4b (commit)
      from  be28e23f39cf95d2567682280b63e0202a267a1f (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 7272638723031ecbdaa9d898e499647293c11b4b
Author: Phil Carns <carns at mcs.anl.gov>
Date:   Wed Apr 29 10:59:18 2015 -0400

    fix for gnuplot version number check
    
    - contributed by Kay Thust

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |    5 +++++
 darshan-runtime/configure                          |   20 ++++++++++----------
 darshan-runtime/configure.in                       |    2 +-
 darshan-util/configure                             |   20 ++++++++++----------
 darshan-util/configure.in                          |    2 +-
 .../bin/darshan-job-summary.pl.in                  |    2 +-
 6 files changed, 28 insertions(+), 23 deletions(-)


Diff of changes:
diff --git a/ChangeLog b/ChangeLog
index 9b564be..6734f75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 Darshan Release Change Log
 --------------------------
 
+darshan-2.3.2-pre1
+=============
+* Fix gnuplot version number check to allow darshan-job-summary.pl to work
+  with gnuplot 5.0 (Kay Thust)
+
 darshan-2.3.1
 =============
 * added documentation and example configuration files for using the -profile
diff --git a/darshan-runtime/configure b/darshan-runtime/configure
index e40f42d..d7d19a2 100755
--- a/darshan-runtime/configure
+++ b/darshan-runtime/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for darshan-runtime 2.3.1.
+# Generated by GNU Autoconf 2.69 for darshan-runtime 2.3.2-pre1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='darshan-runtime'
 PACKAGE_TARNAME='darshan-runtime'
-PACKAGE_VERSION='2.3.1'
-PACKAGE_STRING='darshan-runtime 2.3.1'
+PACKAGE_VERSION='2.3.2-pre1'
+PACKAGE_STRING='darshan-runtime 2.3.2-pre1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1244,7 +1244,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures darshan-runtime 2.3.1 to adapt to many kinds of systems.
+\`configure' configures darshan-runtime 2.3.2-pre1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1305,7 +1305,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of darshan-runtime 2.3.1:";;
+     short | recursive ) echo "Configuration of darshan-runtime 2.3.2-pre1:";;
    esac
   cat <<\_ACEOF
 
@@ -1409,7 +1409,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-darshan-runtime configure 2.3.1
+darshan-runtime configure 2.3.2-pre1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1761,7 +1761,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by darshan-runtime $as_me 2.3.1, which was
+It was created by darshan-runtime $as_me 2.3.2-pre1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4264,7 +4264,7 @@ $as_echo "no" >&6; }
     MPICH_LIB_OLD=0
 fi
 
-DARSHAN_VERSION="2.3.1"
+DARSHAN_VERSION="2.3.2-pre1"
 
 
 
@@ -4783,7 +4783,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by darshan-runtime $as_me 2.3.1, which was
+This file was extended by darshan-runtime $as_me 2.3.2-pre1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4845,7 +4845,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-darshan-runtime config.status 2.3.1
+darshan-runtime config.status 2.3.2-pre1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/darshan-runtime/configure.in b/darshan-runtime/configure.in
index 8bdc52e..8b2d1a8 100644
--- a/darshan-runtime/configure.in
+++ b/darshan-runtime/configure.in
@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl You may need to use autoheader as well if changing any DEFINEs
 
 dnl sanity checks, output header, location of scripts used here
-AC_INIT([darshan-runtime], [2.3.1])
+AC_INIT([darshan-runtime], [2.3.2-pre1])
 AC_CONFIG_SRCDIR([darshan.h])
 AC_CONFIG_AUX_DIR(../maint/config)
 AC_CONFIG_HEADER(darshan-runtime-config.h)
diff --git a/darshan-util/configure b/darshan-util/configure
index 6b143a1..e9d9020 100755
--- a/darshan-util/configure
+++ b/darshan-util/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for darshan-util 2.3.1.
+# Generated by GNU Autoconf 2.69 for darshan-util 2.3.2-pre1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='darshan-util'
 PACKAGE_TARNAME='darshan-util'
-PACKAGE_VERSION='2.3.1'
-PACKAGE_STRING='darshan-util 2.3.1'
+PACKAGE_VERSION='2.3.2-pre1'
+PACKAGE_STRING='darshan-util 2.3.2-pre1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1236,7 +1236,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures darshan-util 2.3.1 to adapt to many kinds of systems.
+\`configure' configures darshan-util 2.3.2-pre1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1297,7 +1297,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of darshan-util 2.3.1:";;
+     short | recursive ) echo "Configuration of darshan-util 2.3.2-pre1:";;
    esac
   cat <<\_ACEOF
 
@@ -1393,7 +1393,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-darshan-util configure 2.3.1
+darshan-util configure 2.3.2-pre1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1758,7 +1758,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by darshan-util $as_me 2.3.1, which was
+It was created by darshan-util $as_me 2.3.2-pre1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4105,7 +4105,7 @@ fi
 done
 
 
-DARSHAN_UTIL_VERSION="2.3.1"
+DARSHAN_UTIL_VERSION="2.3.2-pre1"
 
 
 
@@ -4621,7 +4621,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by darshan-util $as_me 2.3.1, which was
+This file was extended by darshan-util $as_me 2.3.2-pre1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4683,7 +4683,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-darshan-util config.status 2.3.1
+darshan-util config.status 2.3.2-pre1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/darshan-util/configure.in b/darshan-util/configure.in
index 3246f63..813448e 100644
--- a/darshan-util/configure.in
+++ b/darshan-util/configure.in
@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl You may need to use autoheader as well if changing any DEFINEs
 
 dnl sanity checks, output header, location of scripts used here
-AC_INIT([darshan-util], [2.3.1])
+AC_INIT([darshan-util], [2.3.2-pre1])
 AC_CONFIG_SRCDIR([darshan-logutils.h])
 AC_CONFIG_AUX_DIR(../maint/config)
 AC_CONFIG_HEADER(darshan-util-config.h)
diff --git a/darshan-util/darshan-job-summary/bin/darshan-job-summary.pl.in b/darshan-util/darshan-job-summary/bin/darshan-job-summary.pl.in
index 1663244..50c2de2 100755
--- a/darshan-util/darshan-job-summary/bin/darshan-job-summary.pl.in
+++ b/darshan-util/darshan-job-summary/bin/darshan-job-summary.pl.in
@@ -1410,7 +1410,7 @@ sub check_prereqs
     }
     
     $output =~ /gnuplot (\d+)\.(\d+)/;
-    if($1 < 4 || $2 < 2)
+    if($1 < 4 || ($1 < 5 && $2 < 2))
     {
         print("error: detected $gnuplot version $1.$2, but darshan-job-summary requires at least 4.2.\n");
         exit(1);


hooks/post-receive
--



More information about the Darshan-commits mailing list