<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Shane Snyder pushed to branch dev-modular at <a href="https://xgitlab.cels.anl.gov/darshan/darshan">darshan / darshan</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/ca2023049f9caf1d5b3e57a6526c9f9f82f27597">ca202304</a></strong>
<div>
<span>by Shane Snyder</span>
<i>at 2015-09-29T16:37:27Z</i>
</div>
<pre class='commit-message'>code cleanup + finalized dev-modular docs</pre>
</li>
<li>
<strong><a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/ac48a609de5402d84d461208453113bf7a631570">ac48a609</a></strong>
<div>
<span>by Shane Snyder</span>
<i>at 2015-09-30T22:41:26Z</i>
</div>
<pre class='commit-message'>update darshan-util to recognize partial log files</pre>
</li>
<li>
<strong><a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e">c53dd65a</a></strong>
<div>
<span>by Shane Snyder</span>
<i>at 2015-09-30T22:54:45Z</i>
</div>
<pre class='commit-message'>add reduction to check for partial flag</pre>
</li>
</ul>
<h4>15 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
darshan-null-log-format.h
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
darshan-runtime/Makefile.in
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
darshan-runtime/configure
</a>
</li>
<li class='file-stats'>
<a href='#diff-3'>
darshan-runtime/darshan-runtime-config.h.in
</a>
</li>
<li class='file-stats'>
<a href='#diff-4'>
darshan-runtime/lib/darshan-core.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-5'>
darshan-util/Makefile.in
</a>
</li>
<li class='file-stats'>
<a href='#diff-6'>
darshan-util/darshan-convert.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-7'>
darshan-util/darshan-job-summary/bin/darshan-job-summary.pl.in
</a>
</li>
<li class='file-stats'>
<a href='#diff-8'>
darshan-util/darshan-job-summary/share/summary.tex
</a>
</li>
<li class='file-stats'>
<a href='#diff-9'>
darshan-util/darshan-logutils.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-10'>
darshan-util/darshan-logutils.h
</a>
</li>
<li class='file-stats'>
<a href='#diff-11'>
<span class='new-file'>
+
darshan-util/darshan-null-logutils.c
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-12'>
<span class='new-file'>
+
darshan-util/darshan-null-logutils.h
</span>
</a>
</li>
<li class='file-stats'>
<a href='#diff-13'>
darshan-util/darshan-parser.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-14'>
doc/darshan-modularization.txt
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-0'>
<strong>
darshan-null-log-format.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-null-log-format.h
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-null-log-format.h
</span><span style="color: #aaaaaa">@@ -9,23 +9,35 @@
</span>
#include "darshan-log-format.h"
<span style="color: #000000;background-color: #ddffdd">+#define NULL_COUNTERS \
+ /* count of number of 'bar' function calls */\
+ X(NULL_BARS) \
+ /* arbitrary data value set by last call to 'bar' */\
+ X(NULL_BAR_DAT) \
+ /* end of counters */\
+ X(NULL_NUM_INDICES)
+
+#define NULL_F_COUNTERS \
+ /* timestamp of the first call to function 'bar' */\
+ X(NULL_F_BAR_TIMESTAMP) \
+ /* timer indicating duration of last call to 'bar' */\
+ X(NULL_F_BAR_DURATION) \
+ /* end of counters */\
+ X(NULL_F_NUM_INDICES)
+
+#define X(a) a,
</span> /* integer counters for the "NULL" example module */
enum darshan_null_indices
{
<span style="color: #000000;background-color: #ffdddd">- NULL_BARS, /* count of number of 'bar' function calls */
- NULL_BAR_DAT, /* arbitrary data value set by last call to 'bar' */
</span>-
<span style="color: #000000;background-color: #ffdddd">- NULL_NUM_INDICES,
</span><span style="color: #000000;background-color: #ddffdd">+ NULL_COUNTERS
</span> };
/* floating point counters for the "NULL" example module */
enum darshan_null_f_indices
{
<span style="color: #000000;background-color: #ffdddd">- NULL_F_BAR_TIMESTAMP, /* timestamp of the first call to function 'bar' */
- NULL_F_BAR_DURATION, /* timer indicating duration of last call to 'bar' */
</span>-
<span style="color: #000000;background-color: #ffdddd">- NULL_F_NUM_INDICES,
</span><span style="color: #000000;background-color: #ddffdd">+ NULL_F_COUNTERS
</span> };
<span style="color: #000000;background-color: #ddffdd">+#undef X
</span>
/* the darshan_null_record structure encompasses the high-level data/counters
* which would actually be logged to file by Darshan for the "NULL" example
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-1'>
<strong>
darshan-runtime/Makefile.in
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-runtime/Makefile.in
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-runtime/Makefile.in
</span><span style="color: #aaaaaa">@@ -1,5 +1,7 @@
</span> all: lib/libdarshan.a lib/libdarshan-stubs.a lib/darshan-null.o
<span style="color: #000000;background-color: #ddffdd">+#TODO: each module provides own makefile with module-specific objects, build options, etc.
+
</span> DESTDIR =
srcdir = @srcdir@
prefix = @prefix@
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-2'>
<strong>
darshan-runtime/configure
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-runtime/configure
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-runtime/configure
</span><span style="color: #aaaaaa">@@ -1,18 +1,20 @@
</span> #! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for darshan-runtime 3.0.0-pre1.
<span style="color: #000000;background-color: #ddffdd">+# Generated by GNU Autoconf 2.69 for darshan-runtime 3.0.0-pre1.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
</span> #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
<span style="color: #000000;background-color: #ddffdd">+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
</span>
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ddffdd">+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
</span> emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
<span style="color: #aaaaaa">@@ -20,23 +22,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
</span> alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
<span style="color: #000000;background-color: #ffdddd">- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
</span><span style="color: #000000;background-color: #ddffdd">+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
</span> esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
<span style="color: #aaaaaa">@@ -44,7 +38,13 @@ export as_nl
</span> as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
<span style="color: #000000;background-color: #ddffdd">+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
</span> as_echo='printf %s\n'
as_echo_n='printf %s'
else
<span style="color: #aaaaaa">@@ -55,7 +55,7 @@ else
</span> as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
<span style="color: #000000;background-color: #ffdddd">- case $arg in
</span><span style="color: #000000;background-color: #ddffdd">+ case $arg in #(
</span> *"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
<span style="color: #aaaaaa">@@ -78,13 +78,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
</span> }
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ffdddd">- as_unset=unset
</span>-else
<span style="color: #000000;background-color: #ffdddd">- as_unset=false
</span>-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
<span style="color: #aaaaaa">@@ -94,15 +87,16 @@ fi
</span> IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
<span style="color: #000000;background-color: #ddffdd">+as_myself=
+case $0 in #((
</span> *[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
</span>-done
<span style="color: #000000;background-color: #ddffdd">+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
</span> IFS=$as_save_IFS
;;
<span style="color: #aaaaaa">@@ -114,12 +108,16 @@ if test "x$as_myself" = x; then
</span> fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }
</span><span style="color: #000000;background-color: #ddffdd">+ exit 1
</span> fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
<span style="color: #000000;background-color: #ddffdd">+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
</span> done
PS1='$ '
PS2='> '
<span style="color: #aaaaaa">@@ -131,330 +129,344 @@ export LC_ALL
</span> LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
<span style="color: #000000;background-color: #ffdddd">- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
</span>-else
<span style="color: #000000;background-color: #ffdddd">- as_expr=false
</span>-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
<span style="color: #000000;background-color: #ffdddd">- as_basename=basename
</span>-else
<span style="color: #000000;background-color: #ffdddd">- as_basename=false
</span>-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
<span style="color: #000000;background-color: #ffdddd">- sed '/^.*\/\([^/][^/]*\)\/*$/{
</span>- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
-
-
<span style="color: #000000;background-color: #ddffdd">+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
</span> if test "x$CONFIG_SHELL" = x; then
<span style="color: #000000;background-color: #ffdddd">- if (eval ":") 2>/dev/null; then
- as_have_required=yes
</span><span style="color: #000000;background-color: #ddffdd">+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
</span> else
<span style="color: #000000;background-color: #ffdddd">- as_have_required=no
</span><span style="color: #000000;background-color: #ddffdd">+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
</span> fi
-
<span style="color: #000000;background-color: #ffdddd">- if test $as_have_required = yes && (eval ":
</span>-(as_func_return () {
<span style="color: #000000;background-color: #ffdddd">- (exit \$1)
</span>-}
-as_func_success () {
<span style="color: #000000;background-color: #ffdddd">- as_func_return 0
</span>-}
-as_func_failure () {
<span style="color: #000000;background-color: #ffdddd">- as_func_return 1
</span>-}
-as_func_ret_success () {
<span style="color: #000000;background-color: #ffdddd">- return 0
</span>-}
-as_func_ret_failure () {
<span style="color: #000000;background-color: #ffdddd">- return 1
</span>-}
<span style="color: #000000;background-color: #ddffdd">+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
</span>
exitcode=0
-if as_func_success; then
<span style="color: #000000;background-color: #ffdddd">- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_success failed.
</span>-fi
-
-if as_func_failure; then
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_failure succeeded.
</span>-fi
-
-if as_func_ret_success; then
<span style="color: #000000;background-color: #ffdddd">- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_ret_success failed.
</span>-fi
-
-if as_func_ret_failure; then
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_ret_failure succeeded.
</span>-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
<span style="color: #000000;background-color: #ffdddd">- :
</span><span style="color: #000000;background-color: #ddffdd">+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
</span> else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo positional parameters were not saved.
</span><span style="color: #000000;background-color: #ddffdd">+ as_have_required=no
</span> fi
<span style="color: #000000;background-color: #ddffdd">+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
</span>
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
<span style="color: #000000;background-color: #ffdddd">- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
</span>-") 2> /dev/null; then
<span style="color: #000000;background-color: #ffdddd">- :
</span> else
<span style="color: #000000;background-color: #ffdddd">- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span style="color: #000000;background-color: #ddffdd">+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
</span> for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- case $as_dir in
</span><span style="color: #000000;background-color: #ddffdd">+ as_found=:
+ case $as_dir in #(
</span> /*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
<span style="color: #000000;background-color: #ddffdd">+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
</span> done;;
esac
<span style="color: #000000;background-color: #ddffdd">+ as_found=false
</span> done
<span style="color: #000000;background-color: #ddffdd">+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
</span> IFS=$as_save_IFS
<span style="color: #000000;background-color: #ffdddd">- for as_shell in $as_candidate_shells $SHELL; do
</span>- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ffdddd">- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
</span>-else
<span style="color: #000000;background-color: #ffdddd">- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
</span>-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
<span style="color: #000000;background-color: #ffdddd">- CONFIG_SHELL=$as_shell
</span>- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ffdddd">- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
</span>-else
<span style="color: #000000;background-color: #ffdddd">- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
</span><span style="color: #000000;background-color: #ddffdd">+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
</span> esac
-
-fi
-
-
-:
-(as_func_return () {
<span style="color: #000000;background-color: #ffdddd">- (exit $1)
</span>-}
-as_func_success () {
<span style="color: #000000;background-color: #ffdddd">- as_func_return 0
</span>-}
-as_func_failure () {
<span style="color: #000000;background-color: #ffdddd">- as_func_return 1
</span>-}
-as_func_ret_success () {
<span style="color: #000000;background-color: #ffdddd">- return 0
</span>-}
-as_func_ret_failure () {
<span style="color: #000000;background-color: #ffdddd">- return 1
</span>-}
-
-exitcode=0
-if as_func_success; then
<span style="color: #000000;background-color: #ffdddd">- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_success failed.
</span>-fi
-
-if as_func_failure; then
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_failure succeeded.
</span>-fi
-
-if as_func_ret_success; then
<span style="color: #000000;background-color: #ffdddd">- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_ret_success failed.
</span>-fi
-
-if as_func_ret_failure; then
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_ret_failure succeeded.
</span>-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
<span style="color: #000000;background-color: #ffdddd">- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo positional parameters were not saved.
</span><span style="color: #000000;background-color: #ddffdd">+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
</span> fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
<span style="color: #000000;background-color: #ffdddd">- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
</span>-
-_ASEOF
-}; then
<span style="color: #000000;background-color: #ffdddd">- break
</span> fi
-
fi
<span style="color: #000000;background-color: #ddffdd">+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
</span>
<span style="color: #000000;background-color: #ffdddd">- done
</span>-
<span style="color: #000000;background-color: #ffdddd">- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
</span>- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
<span style="color: #000000;background-color: #ddffdd">+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
</span>
<span style="color: #000000;background-color: #ddffdd">+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
</span>
<span style="color: #000000;background-color: #ffdddd">- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
</span>-fi
<span style="color: #000000;background-color: #ddffdd">+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
</span>
<span style="color: #000000;background-color: #ddffdd">+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
</span>
-fi
-fi
<span style="color: #000000;background-color: #ddffdd">+} # as_fn_mkdir_p
</span>
<span style="color: #000000;background-color: #ddffdd">+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
</span>
-(eval "as_func_return () {
<span style="color: #000000;background-color: #ffdddd">- (exit \$1)
</span>-}
-as_func_success () {
<span style="color: #000000;background-color: #ffdddd">- as_func_return 0
</span>-}
-as_func_failure () {
<span style="color: #000000;background-color: #ffdddd">- as_func_return 1
</span>-}
-as_func_ret_success () {
<span style="color: #000000;background-color: #ffdddd">- return 0
</span>-}
-as_func_ret_failure () {
<span style="color: #000000;background-color: #ffdddd">- return 1
</span>-}
<span style="color: #000000;background-color: #ddffdd">+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
</span>
-exitcode=0
-if as_func_success; then
<span style="color: #000000;background-color: #ffdddd">- :
</span><span style="color: #000000;background-color: #ddffdd">+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
</span> else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_success failed.
</span>-fi
-
-if as_func_failure; then
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_failure succeeded.
</span><span style="color: #000000;background-color: #ddffdd">+ as_expr=false
</span> fi
-if as_func_ret_success; then
<span style="color: #000000;background-color: #ffdddd">- :
</span><span style="color: #000000;background-color: #ddffdd">+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
</span> else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_ret_success failed.
</span>-fi
-
-if as_func_ret_failure; then
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo as_func_ret_failure succeeded.
</span><span style="color: #000000;background-color: #ddffdd">+ as_basename=false
</span> fi
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
<span style="color: #000000;background-color: #ffdddd">- :
</span><span style="color: #000000;background-color: #ddffdd">+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
</span> else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo positional parameters were not saved.
</span><span style="color: #000000;background-color: #ddffdd">+ as_dirname=false
</span> fi
-test \$exitcode = 0") || {
<span style="color: #000000;background-color: #ffdddd">- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf@gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
</span>-}
-
<span style="color: #000000;background-color: #ddffdd">+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
</span>
<span style="color: #000000;background-color: #ddffdd">+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
</span>
<span style="color: #000000;background-color: #ffdddd">- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
</span>
<span style="color: #000000;background-color: #ffdddd">- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
</span><span style="color: #000000;background-color: #ddffdd">+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
</span> sed -n '
p
/[$]LINENO/=
<span style="color: #aaaaaa">@@ -471,9 +483,12 @@ test \$exitcode = 0") || {
</span> s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
</span>
<span style="color: #000000;background-color: #ddffdd">+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
</span> # Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
<span style="color: #aaaaaa">@@ -482,29 +497,18 @@ test \$exitcode = 0") || {
</span> exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ffdddd">- as_dirname=dirname
</span>-else
<span style="color: #000000;background-color: #ffdddd">- as_dirname=false
</span>-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
<span style="color: #000000;background-color: #ddffdd">+case `echo -n x` in #(((((
</span> -n*)
<span style="color: #000000;background-color: #ffdddd">- case `echo 'x\c'` in
</span><span style="color: #000000;background-color: #ddffdd">+ case `echo 'xy\c'` in
</span> *c*) ECHO_T=' ';; # ECHO_T is single tab character.
<span style="color: #000000;background-color: #ffdddd">- *) ECHO_C='\c';;
</span><span style="color: #000000;background-color: #ddffdd">+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
</span> esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
<span style="color: #000000;background-color: #ffdddd">- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
</span>-else
<span style="color: #000000;background-color: #ffdddd">- as_expr=false
</span>-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
<span style="color: #aaaaaa">@@ -519,49 +523,29 @@ if (echo >conf$$.file) 2>/dev/null; then
</span> # ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
<span style="color: #000000;background-color: #ffdddd">- # In both cases, we have to default to `cp -p'.
</span><span style="color: #000000;background-color: #ddffdd">+ # In both cases, we have to default to `cp -pR'.
</span> ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
<span style="color: #000000;background-color: #ffdddd">- as_ln_s='cp -p'
</span><span style="color: #000000;background-color: #ddffdd">+ as_ln_s='cp -pR'
</span> elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
<span style="color: #000000;background-color: #ffdddd">- as_ln_s='cp -p'
</span><span style="color: #000000;background-color: #ddffdd">+ as_ln_s='cp -pR'
</span> fi
else
<span style="color: #000000;background-color: #ffdddd">- as_ln_s='cp -p'
</span><span style="color: #000000;background-color: #ddffdd">+ as_ln_s='cp -pR'
</span> fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
<span style="color: #000000;background-color: #ffdddd">- as_mkdir_p=:
</span><span style="color: #000000;background-color: #ddffdd">+ as_mkdir_p='mkdir -p "$as_dir"'
</span> else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ffdddd">- as_test_x='test -x'
</span>-else
<span style="color: #000000;background-color: #ffdddd">- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
</span>- test -d "$1/.";
<span style="color: #000000;background-color: #ffdddd">- else
</span>- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
<span style="color: #000000;background-color: #ffdddd">- '\'' sh
- '
</span>-fi
-as_executable_p=$as_test_x
<span style="color: #000000;background-color: #ddffdd">+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
</span>
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
<span style="color: #aaaaaa">@@ -570,11 +554,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
</span> as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-exec 7<&0 </dev/null 6>&1
<span style="color: #000000;background-color: #ddffdd">+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
</span>
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
<span style="color: #000000;background-color: #ddffdd">+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
</span> # so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
<span style="color: #aaaaaa">@@ -589,7 +573,6 @@ cross_compiling=no
</span> subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='darshan-runtime'
<span style="color: #aaaaaa">@@ -597,6 +580,7 @@ PACKAGE_TARNAME='darshan-runtime'
</span> PACKAGE_VERSION='3.0.0-pre1'
PACKAGE_STRING='darshan-runtime 3.0.0-pre1'
PACKAGE_BUGREPORT=''
<span style="color: #000000;background-color: #ddffdd">+PACKAGE_URL=''
</span>
ac_unique_file="darshan.h"
# Factoring default headers for most tests.
<span style="color: #aaaaaa">@@ -688,6 +672,7 @@ bindir
</span> program_transform_name
prefix
exec_prefix
<span style="color: #000000;background-color: #ddffdd">+PACKAGE_URL
</span> PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
<span style="color: #aaaaaa">@@ -780,8 +765,9 @@ do
</span> fi
case $ac_option in
<span style="color: #000000;background-color: #ffdddd">- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
</span><span style="color: #000000;background-color: #ddffdd">+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
</span> esac
# Accept the important Cygnus configure options, so we can diagnose typos.
<span style="color: #aaaaaa">@@ -826,8 +812,7 @@ do
</span> ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "invalid feature name: $ac_useropt"
</span> ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
<span style="color: #aaaaaa">@@ -853,8 +838,7 @@ do
</span> ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "invalid feature name: $ac_useropt"
</span> ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
<span style="color: #aaaaaa">@@ -1058,8 +1042,7 @@ do
</span> ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "invalid package name: $ac_useropt"
</span> ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
<span style="color: #aaaaaa">@@ -1075,8 +1058,7 @@ do
</span> ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "invalid package name: $ac_useropt"
</span> ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
<span style="color: #aaaaaa">@@ -1106,17 +1088,17 @@ do
</span> | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
<span style="color: #000000;background-color: #ffdddd">- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
</span>-Try \`$0 --help' for more information." >&2
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
</span> ;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
<span style="color: #000000;background-color: #ffdddd">- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
</span> eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
<span style="color: #aaaaaa">@@ -1125,7 +1107,7 @@ Try \`$0 --help' for more information." >&2
</span> $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
<span style="color: #000000;background-color: #ffdddd">- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
</span><span style="color: #000000;background-color: #ddffdd">+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
</span> ;;
esac
<span style="color: #aaaaaa">@@ -1133,15 +1115,13 @@ done
</span>
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "missing argument to $ac_option"
</span> fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
<span style="color: #000000;background-color: #ffdddd">- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
</span><span style="color: #000000;background-color: #ddffdd">+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
</span> *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
<span style="color: #aaaaaa">@@ -1164,8 +1144,7 @@ do
</span> [\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
</span> done
# There might be people who depend on the old broken behavior: `$host'
<span style="color: #aaaaaa">@@ -1179,8 +1158,6 @@ target=$target_alias
</span> if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
</span> elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
<span style="color: #aaaaaa">@@ -1195,11 +1172,9 @@ test "$silent" = yes && exec 6>/dev/null
</span> ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "working directory cannot be determined"
</span> test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "pwd does not report name of working directory"
</span>
# Find the source files, if location was not specified.
<span style="color: #aaaaaa">@@ -1238,13 +1213,11 @@ else
</span> fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
</span> fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
</span> pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
<span style="color: #aaaaaa">@@ -1284,7 +1257,7 @@ Configuration:
</span> --help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
<span style="color: #000000;background-color: #ffdddd">- -q, --quiet, --silent do not print \`checking...' messages
</span><span style="color: #000000;background-color: #ddffdd">+ -q, --quiet, --silent do not print \`checking ...' messages
</span> --cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
<span style="color: #aaaaaa">@@ -1364,13 +1337,14 @@ Some influential environment variables:
</span> LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
<span style="color: #000000;background-color: #ffdddd">- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
</span><span style="color: #000000;background-color: #ddffdd">+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
</span> you have headers in a nonstandard directory <include dir>
CPP C preprocessor
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
<span style="color: #000000;background-color: #ddffdd">+Report bugs to the package provider.
</span> _ACEOF
ac_status=$?
fi
<span style="color: #aaaaaa">@@ -1383,72 +1357,410 @@ if test "$ac_init_help" = "recursive"; then
</span> continue
ac_builddir=.
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
<span style="color: #000000;background-color: #ffdddd">- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
</span>-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
<span style="color: #000000;background-color: #ddffdd">+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
+ else
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+ cat <<\_ACEOF
+darshan-runtime configure 3.0.0-pre1
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+ exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
</span>
-case $srcdir in
<span style="color: #000000;background-color: #ffdddd">- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
</span><span style="color: #000000;background-color: #ddffdd">+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
</span> esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
<span style="color: #000000;background-color: #ddffdd">+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
</span>
<span style="color: #000000;background-color: #ffdddd">- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
</span><span style="color: #000000;background-color: #ddffdd">+ ac_retval=1
</span> fi
<span style="color: #000000;background-color: #ddffdd">+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
</span>
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
<span style="color: #000000;background-color: #ffdddd">- cat <<\_ACEOF
</span>-darshan-runtime configure 3.0.0-pre1
-generated by GNU Autoconf 2.63
<span style="color: #000000;background-color: #ddffdd">+} # ac_fn_c_try_link
</span>
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
<span style="color: #000000;background-color: #ddffdd">+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
</span> _ACEOF
<span style="color: #000000;background-color: #ffdddd">- exit
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span> fi
<span style="color: #000000;background-color: #ddffdd">+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
</span> 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 3.0.0-pre1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
<span style="color: #000000;background-color: #ddffdd">+generated by GNU Autoconf 2.69. Invocation command line was
</span>
$ $0 $@
<span style="color: #aaaaaa">@@ -1484,8 +1796,8 @@ for as_dir in $PATH
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- $as_echo "PATH: $as_dir"
</span>-done
<span style="color: #000000;background-color: #ddffdd">+ $as_echo "PATH: $as_dir"
+ done
</span> IFS=$as_save_IFS
} >&5
<span style="color: #aaaaaa">@@ -1522,9 +1834,9 @@ do
</span> ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
<span style="color: #000000;background-color: #ffdddd">- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
</span><span style="color: #000000;background-color: #ddffdd">+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
</span> 2)
<span style="color: #000000;background-color: #ffdddd">- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_append ac_configure_args1 " '$ac_arg'"
</span> if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
<span style="color: #aaaaaa">@@ -1540,13 +1852,13 @@ do
</span> -* ) ac_must_keep_next=true ;;
esac
fi
<span style="color: #000000;background-color: #ffdddd">- ac_configure_args="$ac_configure_args '$ac_arg'"
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_append ac_configure_args " '$ac_arg'"
</span> ;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
<span style="color: #000000;background-color: #ddffdd">+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
</span>
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
<span style="color: #aaaaaa">@@ -1558,11 +1870,9 @@ trap 'exit_status=$?
</span> {
echo
<span style="color: #000000;background-color: #ffdddd">- cat <<\_ASBOX
</span>-## ---------------- ##
<span style="color: #000000;background-color: #ddffdd">+ $as_echo "## ---------------- ##
</span> ## Cache variables. ##
-## ---------------- ##
-_ASBOX
<span style="color: #000000;background-color: #ddffdd">+## ---------------- ##"
</span> echo
# The following way of writing the cache mishandles newlines in values,
(
<span style="color: #aaaaaa">@@ -1571,13 +1881,13 @@ _ASBOX
</span> case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
<span style="color: #000000;background-color: #ffdddd">- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
</span> $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
<span style="color: #000000;background-color: #ffdddd">- *) $as_unset $ac_var ;;
</span><span style="color: #000000;background-color: #ddffdd">+ *) { eval $ac_var=; unset $ac_var;} ;;
</span> esac ;;
esac
done
<span style="color: #aaaaaa">@@ -1596,11 +1906,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
</span> )
echo
<span style="color: #000000;background-color: #ffdddd">- cat <<\_ASBOX
</span>-## ----------------- ##
<span style="color: #000000;background-color: #ddffdd">+ $as_echo "## ----------------- ##
</span> ## Output variables. ##
-## ----------------- ##
-_ASBOX
<span style="color: #000000;background-color: #ddffdd">+## ----------------- ##"
</span> echo
for ac_var in $ac_subst_vars
do
<span style="color: #aaaaaa">@@ -1613,11 +1921,9 @@ _ASBOX
</span> echo
if test -n "$ac_subst_files"; then
<span style="color: #000000;background-color: #ffdddd">- cat <<\_ASBOX
</span>-## ------------------- ##
<span style="color: #000000;background-color: #ddffdd">+ $as_echo "## ------------------- ##
</span> ## File substitutions. ##
-## ------------------- ##
-_ASBOX
<span style="color: #000000;background-color: #ddffdd">+## ------------------- ##"
</span> echo
for ac_var in $ac_subst_files
do
<span style="color: #aaaaaa">@@ -1631,11 +1937,9 @@ _ASBOX
</span> fi
if test -s confdefs.h; then
<span style="color: #000000;background-color: #ffdddd">- cat <<\_ASBOX
</span>-## ----------- ##
<span style="color: #000000;background-color: #ddffdd">+ $as_echo "## ----------- ##
</span> ## confdefs.h. ##
-## ----------- ##
-_ASBOX
<span style="color: #000000;background-color: #ddffdd">+## ----------- ##"
</span> echo
cat confdefs.h
echo
<span style="color: #aaaaaa">@@ -1649,46 +1953,53 @@ _ASBOX
</span> exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
<span style="color: #000000;background-color: #ffdddd">- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
</span><span style="color: #000000;background-color: #ddffdd">+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
</span> done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
<span style="color: #000000;background-color: #ddffdd">+$as_echo "/* confdefs.h */" > confdefs.h
+
</span> # Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
<span style="color: #000000;background-color: #ddffdd">+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
</span>
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
<span style="color: #000000;background-color: #ffdddd">- ac_site_file1=$CONFIG_SITE
</span><span style="color: #000000;background-color: #ddffdd">+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
</span> elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
<span style="color: #aaaaaa">@@ -1699,19 +2010,23 @@ fi
</span> for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
<span style="color: #000000;background-color: #ffdddd">- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
</span> $as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
<span style="color: #000000;background-color: #ffdddd">- . "$ac_site_file"
</span><span style="color: #000000;background-color: #ddffdd">+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
</span> fi
done
if test -r "$cache_file"; then
<span style="color: #000000;background-color: #ffdddd">- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
</span> $as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
<span style="color: #aaaaaa">@@ -1719,7 +2034,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
</span> esac
fi
else
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
</span> $as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
<span style="color: #aaaaaa">@@ -1734,11 +2049,11 @@ for ac_var in $ac_precious_vars; do
</span> eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
</span> $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
</span> $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
<span style="color: #aaaaaa">@@ -1748,17 +2063,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
</span> ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
</span> $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
</span> $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
</span> $as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
</span> $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
<span style="color: #aaaaaa">@@ -1770,43 +2085,20 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
</span> esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
<span style="color: #000000;background-color: #ffdddd">- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
</span><span style="color: #000000;background-color: #ddffdd">+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
</span> esac
fi
done
if $ac_cache_corrupted; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
</span> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
</span> $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
</span>-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
</span> fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<span style="color: #000000;background-color: #ddffdd">+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
</span>
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
<span style="color: #aaaaaa">@@ -1833,9 +2125,7 @@ for ac_dir in ../maint/config "$srcdir"/../maint/config; do
</span> fi
done
if test -z "$ac_aux_dir"; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../maint/config \"$srcdir\"/../maint/config" >&5
</span>-$as_echo "$as_me: error: cannot find install-sh or install.sh in ../maint/config \"$srcdir\"/../maint/config" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../maint/config \"$srcdir\"/../maint/config" "$LINENO" 5
</span> fi
# These three variables are undocumented and unsupported,
<span style="color: #aaaaaa">@@ -1864,10 +2154,10 @@ ac_config_headers="$ac_config_headers darshan-runtime-config.h"
</span> # OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
</span> $as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_path_install+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
<span style="color: #aaaaaa">@@ -1875,11 +2165,11 @@ for as_dir in $PATH
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- # Account for people who put trailing slashes in PATH elements.
</span>-case $as_dir/ in
<span style="color: #000000;background-color: #ffdddd">- ./ | .// | /cC/* | \
</span><span style="color: #000000;background-color: #ddffdd">+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
</span> /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
<span style="color: #000000;background-color: #ffdddd">- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
</span><span style="color: #000000;background-color: #ddffdd">+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
</span> /usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
<span style="color: #aaaaaa">@@ -1887,7 +2177,7 @@ case $as_dir/ in
</span> # by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
<span style="color: #000000;background-color: #ddffdd">+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
</span> if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
<span style="color: #aaaaaa">@@ -1916,7 +2206,7 @@ case $as_dir/ in
</span> ;;
esac
-done
<span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
<span style="color: #aaaaaa">@@ -1932,7 +2222,7 @@ fi
</span> INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
</span> $as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
<span style="color: #aaaaaa">@@ -1944,7 +2234,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
</span> test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ $as_echo "$as_me:$LINENO: checking whether the mpicc compiler works" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the mpicc compiler works" >&5
</span> $as_echo_n "checking whether the mpicc compiler works... " >&6; }
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
<span style="color: #aaaaaa">@@ -1954,9 +2244,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span> if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span> $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_prog_CC+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
<span style="color: #aaaaaa">@@ -1967,24 +2257,24 @@ for as_dir in $PATH
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span> ac_cv_prog_CC="${ac_tool_prefix}gcc"
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span> break 2
fi
done
-done
<span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: $CC" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
</span> $as_echo "$CC" >&6; }
else
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: no" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
fi
<span style="color: #aaaaaa">@@ -1994,9 +2284,9 @@ if test -z "$ac_cv_prog_CC"; then
</span> ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span> $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_prog_ac_ct_CC+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
<span style="color: #aaaaaa">@@ -2007,24 +2297,24 @@ for as_dir in $PATH
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span> ac_cv_prog_ac_ct_CC="gcc"
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span> break 2
fi
done
-done
<span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
</span> $as_echo "$ac_ct_CC" >&6; }
else
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: no" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
fi
<span style="color: #aaaaaa">@@ -2033,7 +2323,7 @@ fi
</span> else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
</span> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
<span style="color: #aaaaaa">@@ -2047,9 +2337,9 @@ if test -z "$CC"; then
</span> if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span> $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_prog_CC+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
<span style="color: #aaaaaa">@@ -2060,24 +2350,24 @@ for as_dir in $PATH
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span> ac_cv_prog_CC="${ac_tool_prefix}cc"
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span> break 2
fi
done
-done
<span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: $CC" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
</span> $as_echo "$CC" >&6; }
else
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: no" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
fi
<span style="color: #aaaaaa">@@ -2087,9 +2377,9 @@ fi
</span> if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span> $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_prog_CC+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
<span style="color: #aaaaaa">@@ -2101,18 +2391,18 @@ for as_dir in $PATH
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span> if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span> break 2
fi
done
-done
<span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
<span style="color: #aaaaaa">@@ -2131,10 +2421,10 @@ fi
</span> fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: $CC" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
</span> $as_echo "$CC" >&6; }
else
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: no" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
fi
<span style="color: #aaaaaa">@@ -2146,9 +2436,9 @@ if test -z "$CC"; then
</span> do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span> $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_prog_CC+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
<span style="color: #aaaaaa">@@ -2159,24 +2449,24 @@ for as_dir in $PATH
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span> ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span> break 2
fi
done
-done
<span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: $CC" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
</span> $as_echo "$CC" >&6; }
else
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: no" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
fi
<span style="color: #aaaaaa">@@ -2190,9 +2480,9 @@ if test -z "$CC"; then
</span> do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span> $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_prog_ac_ct_CC+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
<span style="color: #aaaaaa">@@ -2203,24 +2493,24 @@ for as_dir in $PATH
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span> ac_cv_prog_ac_ct_CC="$ac_prog"
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span> break 2
fi
done
-done
<span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
</span> $as_echo "$ac_ct_CC" >&6; }
else
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: no" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
fi
<span style="color: #aaaaaa">@@ -2233,7 +2523,7 @@ done
</span> else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
</span> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
<span style="color: #aaaaaa">@@ -2244,57 +2534,37 @@ fi
</span> fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
<span style="color: #000000;background-color: #ddffdd">+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
</span> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }; }
</span><span style="color: #000000;background-color: #ddffdd">+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
</span>
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
<span style="color: #000000;background-color: #ddffdd">+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
</span> set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
</span>-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
</span>-{ (ac_try="$ac_compiler -V >&5"
<span style="color: #000000;background-color: #ddffdd">+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
</span> case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compiler -V >&5") 2>&5
</span><span style="color: #000000;background-color: #ddffdd">+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
</span> ac_status=$?
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
</span><span style="color: #000000;background-color: #ddffdd">+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
</span>
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2310,8 +2580,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
</span> # Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
</span> ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
<span style="color: #aaaaaa">@@ -2327,17 +2597,17 @@ do
</span> done
rm -f $ac_rmfiles
-if { (ac_try="$ac_link_default"
<span style="color: #000000;background-color: #ddffdd">+if { { ac_try="$ac_link_default"
</span> case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ddffdd">+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
</span> (eval "$ac_link_default") 2>&5
ac_status=$?
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
</span> # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
<span style="color: #aaaaaa">@@ -2354,7 +2624,7 @@ do
</span> # certainly right.
break;;
*.* )
<span style="color: #000000;background-color: #ffdddd">- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
</span><span style="color: #000000;background-color: #ddffdd">+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
</span> then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
<span style="color: #aaaaaa">@@ -2373,84 +2643,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
</span> else
ac_file=''
fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
</span> sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
<span style="color: #000000;background-color: #ddffdd">+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
</span> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 77); exit 77; }; }; }
</span><span style="color: #000000;background-color: #ddffdd">+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
</span> fi
-
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
</span> ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
<span style="color: #000000;background-color: #ffdddd">- if { ac_try='./$ac_file'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
</span>- cross_compiling=yes
<span style="color: #000000;background-color: #ffdddd">- else
</span>- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }; }
- fi
- fi
</span>-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
</span> $as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
<span style="color: #000000;background-color: #ddffdd">+if { { ac_try="$ac_link"
</span> case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ddffdd">+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
</span> (eval "$ac_link") 2>&5
ac_status=$?
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
</span> # If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
<span style="color: #aaaaaa">@@ -2465,32 +2692,83 @@ for ac_file in conftest.exe conftest conftest.*; do
</span> esac
done
else
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
</span> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }; }
</span><span style="color: #000000;background-color: #ddffdd">+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
</span> fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
<span style="color: #000000;background-color: #ddffdd">+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
</span> $as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
<span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
</span> $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_objext+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2502,17 +2780,17 @@ main ()
</span> }
_ACEOF
rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
<span style="color: #000000;background-color: #ddffdd">+if { { ac_try="$ac_compile"
</span> case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ddffdd">+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
</span> (eval "$ac_compile") 2>&5
ac_status=$?
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
</span> for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
<span style="color: #aaaaaa">@@ -2525,31 +2803,23 @@ else
</span> $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
<span style="color: #000000;background-color: #ddffdd">+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
</span> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }; }
</span><span style="color: #000000;background-color: #ddffdd">+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
</span> fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
</span> $as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
</span> $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_c_compiler_gnu+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2563,37 +2833,16 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span> ac_compiler_gnu=yes
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
<span style="color: #000000;background-color: #ddffdd">+ ac_compiler_gnu=no
</span> fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
</span> $as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
<span style="color: #aaaaaa">@@ -2602,20 +2851,16 @@ else
</span> fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
</span> $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_prog_cc_g+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2626,35 +2871,11 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span> ac_cv_prog_cc_g=yes
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2665,36 +2886,12 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
<span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span>
- ac_c_werror_flag=$ac_save_c_werror_flag
<span style="color: #000000;background-color: #ddffdd">+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
</span> CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2705,42 +2902,17 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span> ac_cv_prog_cc_g=yes
-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
</span> $as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
<span style="color: #aaaaaa">@@ -2757,23 +2929,18 @@ else
</span> CFLAGS=
fi
fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
</span> $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_prog_cc_c89+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
<span style="color: #000000;background-color: #ddffdd">+struct stat;
</span> /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
<span style="color: #aaaaaa">@@ -2825,32 +2992,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
</span> -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
<span style="color: #000000;background-color: #ffdddd">- rm -f conftest.$ac_objext
</span>-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+ if ac_fn_c_try_compile "$LINENO"; then :
</span> ac_cv_prog_cc_c89=$ac_arg
-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
<span style="color: #aaaaaa">@@ -2861,17 +3005,19 @@ fi
</span> # AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: none needed" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
</span> $as_echo "none needed" >&6; } ;;
xno)
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
</span> $as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
</span> $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
<span style="color: #000000;background-color: #ddffdd">+if test "x$ac_cv_prog_cc_c89" != xno; then :
</span>
<span style="color: #000000;background-color: #ddffdd">+fi
</span>
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
<span style="color: #aaaaaa">@@ -2880,11 +3026,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
</span> ac_compiler_gnu=$ac_cv_c_compiler_gnu
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <mpi.h>
int
<span style="color: #aaaaaa">@@ -2895,38 +3037,15 @@ int ret = MPI_Init(0, (void*)0)
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span> $as_echo "yes" >&6; }
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: CC doesn't appear to be a valid MPI compiler. See INSTALL document or try adding CC=mpicc to your configure command line." >&5
</span>-$as_echo "$as_me: error: CC doesn't appear to be a valid MPI compiler. See INSTALL document or try adding CC=mpicc to your configure command line." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "CC doesn't appear to be a valid MPI compiler. See INSTALL document or try adding CC=mpicc to your configure command line." "$LINENO" 5
</span>
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
<span style="color: #aaaaaa">@@ -2934,14 +3053,14 @@ ac_cpp='$CPP $CPPFLAGS'
</span> ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
</span> $as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
<span style="color: #000000;background-color: #ffdddd">- if test "${ac_cv_prog_CPP+set}" = set; then
</span><span style="color: #000000;background-color: #ddffdd">+ if ${ac_cv_prog_CPP+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
<span style="color: #aaaaaa">@@ -2956,11 +3075,7 @@ do
</span> # <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
<span style="color: #aaaaaa">@@ -2969,78 +3084,34 @@ cat >>conftest.$ac_ext <<_ACEOF
</span> #endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
</span>- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- }; then
- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
<span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_cpp "$LINENO"; then :
</span>
<span style="color: #000000;background-color: #ddffdd">+else
</span> # Broken: fails on valid input.
continue
fi
-
-rm -f conftest.err conftest.$ac_ext
<span style="color: #000000;background-color: #ddffdd">+rm -f conftest.err conftest.i conftest.$ac_ext
</span>
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
</span>- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- }; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_cpp "$LINENO"; then :
</span> # Broken: success on invalid input.
continue
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
-rm -f conftest.err conftest.$ac_ext
<span style="color: #000000;background-color: #ddffdd">+rm -f conftest.err conftest.i conftest.$ac_ext
</span>
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
<span style="color: #000000;background-color: #ddffdd">+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
</span> break
fi
<span style="color: #aaaaaa">@@ -3052,7 +3123,7 @@ fi
</span> else
ac_cv_prog_CPP=$CPP
fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
</span> $as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
<span style="color: #aaaaaa">@@ -3063,11 +3134,7 @@ do
</span> # <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
<span style="color: #aaaaaa">@@ -3076,87 +3143,40 @@ cat >>conftest.$ac_ext <<_ACEOF
</span> #endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
</span>- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- }; then
- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
<span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_cpp "$LINENO"; then :
</span>
<span style="color: #000000;background-color: #ddffdd">+else
</span> # Broken: fails on valid input.
continue
fi
-
-rm -f conftest.err conftest.$ac_ext
<span style="color: #000000;background-color: #ddffdd">+rm -f conftest.err conftest.i conftest.$ac_ext
</span>
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
</span>- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- }; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_cpp "$LINENO"; then :
</span> # Broken: success on invalid input.
continue
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
-rm -f conftest.err conftest.$ac_ext
<span style="color: #000000;background-color: #ddffdd">+rm -f conftest.err conftest.i conftest.$ac_ext
</span>
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
<span style="color: #000000;background-color: #ffdddd">- :
</span><span style="color: #000000;background-color: #ddffdd">+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
</span> else
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
</span> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }; }
</span><span style="color: #000000;background-color: #ddffdd">+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
</span> fi
ac_ext=c
<span style="color: #aaaaaa">@@ -3166,9 +3186,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
</span> ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
</span> $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_path_GREP+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
<span style="color: #aaaaaa">@@ -3179,10 +3199,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- for ac_prog in grep ggrep; do
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_prog in grep ggrep; do
</span> for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
<span style="color: #000000;background-color: #ffdddd">- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_executable_p "$ac_path_GREP" || continue
</span> # Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
<span style="color: #aaaaaa">@@ -3199,7 +3219,7 @@ case `"$ac_path_GREP" --version 2>&1` in
</span> $as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
<span style="color: #000000;background-color: #ffdddd">- ac_count=`expr $ac_count + 1`
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_arith $ac_count + 1 && ac_count=$as_val
</span> if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
<span style="color: #aaaaaa">@@ -3214,26 +3234,24 @@ esac
</span> $ac_path_GREP_found && break 3
done
done
-done
<span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
</span>-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
</span> fi
else
ac_cv_path_GREP=$GREP
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
</span> $as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
</span> $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_path_EGREP+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
<span style="color: #aaaaaa">@@ -3247,10 +3265,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
</span> do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- for ac_prog in egrep; do
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_prog in egrep; do
</span> for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
<span style="color: #000000;background-color: #ffdddd">- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_executable_p "$ac_path_EGREP" || continue
</span> # Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
<span style="color: #aaaaaa">@@ -3267,7 +3285,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
</span> $as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
<span style="color: #000000;background-color: #ffdddd">- ac_count=`expr $ac_count + 1`
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_arith $ac_count + 1 && ac_count=$as_val
</span> if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
<span style="color: #aaaaaa">@@ -3282,12 +3300,10 @@ esac
</span> $ac_path_EGREP_found && break 3
done
done
-done
<span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
</span>-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
</span> fi
else
ac_cv_path_EGREP=$EGREP
<span style="color: #aaaaaa">@@ -3295,21 +3311,17 @@ fi
</span>
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
</span> $as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
</span> $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_header_stdc+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
<span style="color: #aaaaaa">@@ -3324,48 +3336,23 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span> ac_cv_header_stdc=yes
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
<span style="color: #000000;background-color: #ddffdd">+ ac_cv_header_stdc=no
</span> fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
<span style="color: #000000;background-color: #ffdddd">- $EGREP "memchr" >/dev/null 2>&1; then
- :
</span><span style="color: #000000;background-color: #ddffdd">+ $EGREP "memchr" >/dev/null 2>&1; then :
+
</span> else
ac_cv_header_stdc=no
fi
<span style="color: #aaaaaa">@@ -3375,18 +3362,14 @@ fi
</span>
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
<span style="color: #000000;background-color: #ffdddd">- $EGREP "free" >/dev/null 2>&1; then
- :
</span><span style="color: #000000;background-color: #ddffdd">+ $EGREP "free" >/dev/null 2>&1; then :
+
</span> else
ac_cv_header_stdc=no
fi
<span style="color: #aaaaaa">@@ -3396,14 +3379,10 @@ fi
</span>
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
<span style="color: #000000;background-color: #ffdddd">- if test "$cross_compiling" = yes; then
</span><span style="color: #000000;background-color: #ddffdd">+ if test "$cross_compiling" = yes; then :
</span> :
else
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
<span style="color: #aaaaaa">@@ -3430,301 +3409,81 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: program exited with status $ac_status" >&5
</span>-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
<span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_run "$LINENO"; then :
</span>
-( exit $ac_status )
-ac_cv_header_stdc=no
<span style="color: #000000;background-color: #ddffdd">+else
+ ac_cv_header_stdc=no
</span> fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
<span style="color: #000000;background-color: #ddffdd">+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
</span> fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
</span> $as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
<span style="color: #000000;background-color: #ddffdd">+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
</span>
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span>-else
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
<span style="color: #000000;background-color: #ffdddd">- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
</span>-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then
<span style="color: #000000;background-color: #ffdddd">- withval=$with_zlib; if test "$withval" != no ; then
- if test -d "$withval"
- then
- ZLIB_HOME="$withval"
- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
- CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
- __DARSHAN_ZLIB_LINK_FLAGS="-L${ZLIB_HOME}/lib"
- __DARSHAN_ZLIB_INCLUDE_FLAGS="-I${ZLIB_HOME}/include"
- else
- { $as_echo "$as_me:$LINENO: WARNING: Sorry, $withval does not exist, checking usual places" >&5
</span>-$as_echo "$as_me: WARNING: Sorry, $withval does not exist, checking usual places" >&2;}
<span style="color: #000000;background-color: #ffdddd">- fi
</span>-else
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: zlib is required" >&5
</span>-$as_echo "$as_me: error: zlib is required" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span>-fi
-fi
-
-
-if test "${ac_cv_header_zlib_h+set}" = set; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
</span>-$as_echo_n "checking for zlib.h... " >&6; }
-if test "${ac_cv_header_zlib_h+set}" = set; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span>-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
-else
<span style="color: #000000;background-color: #ffdddd">- # Is the header compilable?
</span>-{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
-$as_echo_n "checking zlib.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <zlib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5
-$as_echo_n "checking zlib.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <zlib.h>
<span style="color: #000000;background-color: #ddffdd">+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
</span> _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
</span>- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- }; then
- ac_header_preproc=yes
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
<span style="color: #000000;background-color: #ffdddd">- ac_header_preproc=no
</span> fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
<span style="color: #000000;background-color: #ddffdd">+done
</span>
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
<span style="color: #000000;background-color: #ffdddd">- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
</span>-$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
</span>-$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
<span style="color: #000000;background-color: #ffdddd">- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
</span>-$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
</span>-$as_echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
</span>-$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
</span>-$as_echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
</span>-$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
</span>-$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
<span style="color: #000000;background-color: #ffdddd">- ;;
</span>-esac
-{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
-$as_echo_n "checking for zlib.h... " >&6; }
-if test "${ac_cv_header_zlib_h+set}" = set; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span><span style="color: #000000;background-color: #ddffdd">+
+
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+ withval=$with_zlib; if test "$withval" != no ; then
+ if test -d "$withval"
+ then
+ ZLIB_HOME="$withval"
+ LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+ __DARSHAN_ZLIB_LINK_FLAGS="-L${ZLIB_HOME}/lib"
+ __DARSHAN_ZLIB_INCLUDE_FLAGS="-I${ZLIB_HOME}/include"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sorry, $withval does not exist, checking usual places" >&5
+$as_echo "$as_me: WARNING: Sorry, $withval does not exist, checking usual places" >&2;}
+ fi
</span> else
<span style="color: #000000;background-color: #ffdddd">- ac_cv_header_zlib_h=$ac_header_preproc
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "zlib is required" "$LINENO" 5
</span> fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
-
fi
-if test "x$ac_cv_header_zlib_h" = x""yes; then
<span style="color: #000000;background-color: #ffdddd">- :
</span><span style="color: #000000;background-color: #ddffdd">+
+
+ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+
</span> else
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: z.h not found" >&5
</span>-$as_echo "$as_me: error: z.h not found" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "z.h not found" "$LINENO" 5
</span> fi
-
-{ $as_echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
</span> $as_echo_n "checking for inflateEnd in -lz... " >&6; }
-if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_lib_z_inflateEnd+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
<span style="color: #aaaaaa">@@ -3742,43 +3501,18 @@ return inflateEnd ();
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest$ac_exeext && {
</span>- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
<span style="color: #000000;background-color: #ffdddd">- }; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_link "$LINENO"; then :
</span> ac_cv_lib_z_inflateEnd=yes
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_z_inflateEnd=no
<span style="color: #000000;background-color: #ddffdd">+ ac_cv_lib_z_inflateEnd=no
</span> fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
<span style="color: #000000;background-color: #ffdddd">- conftest$ac_exeext conftest.$ac_ext
</span><span style="color: #000000;background-color: #ddffdd">+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
</span> LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5
</span> $as_echo "$ac_cv_lib_z_inflateEnd" >&6; }
-if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then
<span style="color: #000000;background-color: #ddffdd">+if test "x$ac_cv_lib_z_inflateEnd" = xyes; then :
</span> cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
<span style="color: #aaaaaa">@@ -3786,21 +3520,17 @@ _ACEOF
</span> LIBS="-lz $LIBS"
else
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: libz not found" >&5
</span>-$as_echo "$as_me: error: libz not found" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "libz not found" "$LINENO" 5
</span> fi
# Check whether --enable-cuserid was given.
-if test "${enable_cuserid+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if test "${enable_cuserid+set}" = set; then :
</span> enableval=$enable_cuserid; if test "x$enableval" = "xno" ; then
-cat >>confdefs.h <<\_ACEOF
-#define DARSHAN_DISABLE_CUSERID 1
-_ACEOF
<span style="color: #000000;background-color: #ddffdd">+$as_echo "#define DARSHAN_DISABLE_CUSERID 1" >>confdefs.h
</span> ,
fi
<span style="color: #aaaaaa">@@ -3808,7 +3538,7 @@ fi
</span>
# Check whether --enable-ld-preload was given.
-if test "${enable_ld_preload+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if test "${enable_ld_preload+set}" = set; then :
</span> enableval=$enable_ld_preload; if test "x$enableval" = "xno" ; then
DISABLE_LDPRELOAD="1"
fi
<span style="color: #aaaaaa">@@ -3817,12 +3547,10 @@ fi
</span>
# Check whether --enable-group-readable-logs was given.
-if test "${enable_group_readable_logs+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if test "${enable_group_readable_logs+set}" = set; then :
</span> enableval=$enable_group_readable_logs; if test "x$enableval" = "xyes" ; then
-cat >>confdefs.h <<\_ACEOF
-#define __DARSHAN_GROUP_READABLE_LOGS 1
-_ACEOF
<span style="color: #000000;background-color: #ddffdd">+$as_echo "#define __DARSHAN_GROUP_READABLE_LOGS 1" >>confdefs.h
</span>
fi
<span style="color: #aaaaaa">@@ -3831,11 +3559,9 @@ fi
</span>
# Check whether --with-mem-align was given.
-if test "${with_mem_align+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if test "${with_mem_align+set}" = set; then :
</span> withval=$with_mem_align; if test x$withval = xyes; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: --with-mem-align must be given a number in bytes" >&5
</span>-$as_echo "$as_me: error: --with-mem-align must be given a number in bytes" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "--with-mem-align must be given a number in bytes" "$LINENO" 5
</span> else
cat >>confdefs.h <<_ACEOF
<span style="color: #aaaaaa">@@ -3850,11 +3576,9 @@ fi
</span>
# Check whether --with-log-path-by-env was given.
-if test "${with_log_path_by_env+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if test "${with_log_path_by_env+set}" = set; then :
</span> withval=$with_log_path_by_env; if test x$withval = xyes; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: --with-log-path-by-env must be given at least one variable name" >&5
</span>-$as_echo "$as_me: error: --with-log-path-by-env must be given at least one variable name" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "--with-log-path-by-env must be given at least one variable name" "$LINENO" 5
</span> else
cat >>confdefs.h <<_ACEOF
<span style="color: #aaaaaa">@@ -3870,11 +3594,9 @@ fi
</span>
# Check whether --with-log-hints was given.
-if test "${with_log_hints+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if test "${with_log_hints+set}" = set; then :
</span> withval=$with_log_hints; if test x$withval = xyes; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: --with-log-hints must be given an argument" >&5
</span>-$as_echo "$as_me: error: --with-log-hints must be given an argument" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "--with-log-hints must be given an argument" "$LINENO" 5
</span> else
cat >>confdefs.h <<_ACEOF
<span style="color: #aaaaaa">@@ -3890,11 +3612,9 @@ fi
</span>
# Check whether --with-log-path was given.
-if test "${with_log_path+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if test "${with_log_path+set}" = set; then :
</span> withval=$with_log_path; if test x$withval = xyes; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: --with-log-path must be given a pathname" >&5
</span>-$as_echo "$as_me: error: --with-log-path must be given a pathname" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "--with-log-path must be given a pathname" "$LINENO" 5
</span> else
cat >>confdefs.h <<_ACEOF
<span style="color: #aaaaaa">@@ -3910,11 +3630,9 @@ fi
</span>
# Check whether --with-jobid-env was given.
-if test "${with_jobid_env+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if test "${with_jobid_env+set}" = set; then :
</span> withval=$with_jobid_env; if test x$withval = xyes; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: --with-jobid-env must be given a name" >&5
</span>-$as_echo "$as_me: error: --with-jobid-env must be given a name" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "--with-jobid-env must be given a name" "$LINENO" 5
</span> else
cat >>confdefs.h <<_ACEOF
<span style="color: #aaaaaa">@@ -3929,19 +3647,13 @@ fi
</span>
if test x$GOT_ALIGNMENT != x1; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: must provide --with-mem-align=<num> argument to configure." >&5
</span>-$as_echo "$as_me: error: must provide --with-mem-align=<num> argument to configure." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "must provide --with-mem-align=<num> argument to configure." "$LINENO" 5
</span> fi
if test x$GOT_LOG_PATH != x1; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: must provide --with-log-path=<path> _or_ --with-log-path-by-env=<variable list> argument to configure." >&5
</span>-$as_echo "$as_me: error: must provide --with-log-path=<path> _or_ --with-log-path-by-env=<variable list> argument to configure." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "must provide --with-log-path=<path> _or_ --with-log-path-by-env=<variable list> argument to configure." "$LINENO" 5
</span> fi
if test x$GOT_JOBID != x1; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: must provide --with-jobid-env=<name> argument to configure." >&5
</span>-$as_echo "$as_me: error: must provide --with-jobid-env=<name> argument to configure." >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "must provide --with-jobid-env=<name> argument to configure." "$LINENO" 5
</span> fi
__DARSHAN_LOG_HINTS_DEFAULT="romio_no_indep_rw=true;cb_nodes=4"
if test x$GOT_LOG_HINTS != x1; then
<span style="color: #aaaaaa">@@ -3954,146 +3666,12 @@ fi
</span>
# checks to see how we can print 64 bit values on this architecture
-
-for ac_header in inttypes.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
</span>-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span>-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
<span style="color: #000000;background-color: #ffdddd">- # Is the header compilable?
</span>-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
</span>- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- }; then
- ac_header_preproc=yes
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
<span style="color: #000000;background-color: #ffdddd">- ac_header_preproc=no
</span>-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
<span style="color: #000000;background-color: #ffdddd">- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
<span style="color: #000000;background-color: #ffdddd">- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
<span style="color: #000000;background-color: #ffdddd">- ;;
</span>-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span>-else
<span style="color: #000000;background-color: #ffdddd">- eval "$as_ac_Header=\$ac_header_preproc"
</span>-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
<span style="color: #000000;background-color: #ffdddd">- if test "x$as_val" = x""yes; then
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_header in inttypes.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_inttypes_h" = xyes; then :
</span> cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
<span style="color: #000000;background-color: #ddffdd">+#define HAVE_INTTYPES_H 1
</span> _ACEOF
fi
<span style="color: #aaaaaa">@@ -4101,17 +3679,13 @@ fi
</span> done
if test $ac_cv_header_inttypes_h = yes; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5
</span> $as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; }
-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${gt_cv_inttypes_pri_broken+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <inttypes.h>
#ifdef PRId32
<span style="color: #aaaaaa">@@ -4126,36 +3700,15 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span> gt_cv_inttypes_pri_broken=no
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_inttypes_pri_broken=yes
<span style="color: #000000;background-color: #ddffdd">+ gt_cv_inttypes_pri_broken=yes
</span> fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_inttypes_pri_broken" >&5
</span> $as_echo "$gt_cv_inttypes_pri_broken" >&6; }
fi
if test "$gt_cv_inttypes_pri_broken" = yes; then
<span style="color: #aaaaaa">@@ -4171,175 +3724,32 @@ _ACEOF
</span>
if test x$PRI_MACROS_BROKEN == xyes; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: PRI_xx macros are broken" >&5
</span>-$as_echo "$as_me: error: PRI_xx macros are broken" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span>-else
-
-for ac_header in inttypes.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
</span>-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span>-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
<span style="color: #000000;background-color: #ffdddd">- # Is the header compilable?
</span>-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
</span>- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- }; then
- ac_header_preproc=yes
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
<span style="color: #000000;background-color: #ffdddd">- ac_header_preproc=no
</span>-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
<span style="color: #000000;background-color: #ffdddd">- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
<span style="color: #000000;background-color: #ffdddd">- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
<span style="color: #000000;background-color: #ffdddd">- ;;
</span>-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "PRI_xx macros are broken" "$LINENO" 5
</span> else
<span style="color: #000000;background-color: #ffdddd">- eval "$as_ac_Header=\$ac_header_preproc"
</span>-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
<span style="color: #000000;background-color: #ffdddd">- if test "x$as_val" = x""yes; then
</span><span style="color: #000000;background-color: #ddffdd">+ for ac_header in inttypes.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_inttypes_h" = xyes; then :
</span> cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
<span style="color: #000000;background-color: #ddffdd">+#define HAVE_INTTYPES_H 1
</span> _ACEOF
else
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: Couldn't find inttypes.h" >&5
</span>-$as_echo "$as_me: error: Couldn't find inttypes.h" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "Couldn't find inttypes.h" "$LINENO" 5
</span> fi
done
fi
-
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
</span> $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if ${ac_cv_c_bigendian+:} false; then :
</span> $as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
# See if we're dealing with a universal compiler.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
<span style="color: #aaaaaa">@@ -4347,46 +3757,34 @@ cat >>conftest.$ac_ext <<_ACEOF
</span> typedef int dummy;
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span>
# Check for potential -arch flags. It is not universal unless
- # there are some -arch flags. Note that *ppc* also matches
- # ppc64. This check is also rather less than ideal.
- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
- esac
-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
-
<span style="color: #000000;background-color: #ddffdd">+ # there are at least two -arch flags with different values.
+ ac_arch=
+ ac_prev=
+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+ if test -n "$ac_prev"; then
+ case $ac_word in
+ i?86 | x86_64 | ppc | ppc64)
+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+ ac_arch=$ac_word
+ else
+ ac_cv_c_bigendian=universal
+ break
+ fi
+ ;;
+ esac
+ ac_prev=
+ elif test "x$ac_word" = "x-arch"; then
+ ac_prev=arch
+ fi
+ done
</span> fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_c_bigendian = unknown; then
# See if sys/param.h defines the BYTE_ORDER macro.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
<span style="color: #aaaaaa">@@ -4404,30 +3802,9 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span> # It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
<span style="color: #aaaaaa">@@ -4443,49 +3820,18 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span> ac_cv_c_bigendian=yes
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
<span style="color: #000000;background-color: #ddffdd">+ ac_cv_c_bigendian=no
</span> fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_c_bigendian = unknown; then
# See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <limits.h>
<span style="color: #aaaaaa">@@ -4495,35 +3841,14 @@ main ()
</span> #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
bogus endian macros
#endif
-
<span style="color: #000000;background-color: #ffdddd">- ;
- return 0;
</span>-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- # It does; now see whether it defined to _BIG_ENDIAN or not.
</span>- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
<span style="color: #000000;background-color: #ddffdd">+
+ ;
+ return 0;
+}
</span> _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to _BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <limits.h>
<span style="color: #aaaaaa">@@ -4538,51 +3863,20 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span> ac_cv_c_bigendian=yes
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
<span style="color: #000000;background-color: #ddffdd">+ ac_cv_c_bigendian=no
</span> fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_c_bigendian = unknown; then
# Compile a test program.
<span style="color: #000000;background-color: #ffdddd">- if test "$cross_compiling" = yes; then
</span><span style="color: #000000;background-color: #ddffdd">+ if test "$cross_compiling" = yes; then :
</span> # Try to guess by grepping values from an object file.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
<span style="color: #aaaaaa">@@ -4608,24 +3902,7 @@ return use_ascii (foo) == use_ebcdic (foo);
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span> if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
<span style="color: #aaaaaa">@@ -4637,20 +3914,10 @@ $as_echo "$ac_try_echo") >&5
</span> ac_cv_c_bigendian=unknown
fi
fi
-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
$ac_includes_default
int
<span style="color: #aaaaaa">@@ -4670,79 +3937,41 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_run "$LINENO"; then :
</span> ac_cv_c_bigendian=no
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: program exited with status $ac_status" >&5
</span>-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
<span style="color: #000000;background-color: #ddffdd">+ ac_cv_c_bigendian=yes
</span> fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
<span style="color: #000000;background-color: #ddffdd">+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
</span> fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
</span> $as_echo "$ac_cv_c_bigendian" >&6; }
case $ac_cv_c_bigendian in #(
yes)
<span style="color: #000000;background-color: #ffdddd">- cat >>confdefs.h <<\_ACEOF
</span>-#define WORDS_BIGENDIAN 1
-_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
</span> ;; #(
no)
;; #(
universal)
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
<span style="color: #000000;background-color: #ddffdd">+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
</span>
;; #(
*)
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
</span>-$as_echo "$as_me: error: unknown endianness
<span style="color: #000000;background-color: #ffdddd">- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
</span> esac
old_cflags="$CFLAGS"
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
-{ $as_echo "$as_me:$LINENO: checking for struct aiocb64" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct aiocb64" >&5
</span> $as_echo_n "checking for struct aiocb64... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <aio.h>
<span style="color: #aaaaaa">@@ -4755,52 +3984,25 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span> $as_echo "yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AIOCB64 1
-_ACEOF
<span style="color: #000000;background-color: #ddffdd">+$as_echo "#define HAVE_AIOCB64 1" >>confdefs.h
</span>
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$old_cflags"
old_cflags="$CFLAGS"
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
-{ $as_echo "$as_me:$LINENO: checking for off64_t" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for off64_t" >&5
</span> $as_echo_n "checking for off64_t... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <stdio.h>
<span style="color: #aaaaaa">@@ -4827,182 +4029,25 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span> $as_echo "yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OFF64_T 1
-_ACEOF
<span style="color: #000000;background-color: #ddffdd">+$as_echo "#define HAVE_OFF64_T 1" >>confdefs.h
</span>
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$old_cflags"
-
-
for ac_header in mntent.h sys/mount.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
</span>-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span>-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
<span style="color: #000000;background-color: #ffdddd">- # Is the header compilable?
</span>-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
</span>- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- }; then
- ac_header_preproc=yes
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
<span style="color: #000000;background-color: #ffdddd">- ac_header_preproc=no
</span>-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
<span style="color: #000000;background-color: #ffdddd">- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
<span style="color: #000000;background-color: #ffdddd">- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
</span>-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
<span style="color: #000000;background-color: #ffdddd">- ;;
</span>-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span>-else
<span style="color: #000000;background-color: #ffdddd">- eval "$as_ac_Header=\$ac_header_preproc"
</span>-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
<span style="color: #000000;background-color: #ffdddd">- if test "x$as_val" = x""yes; then
</span><span style="color: #000000;background-color: #ddffdd">+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
</span> cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
<span style="color: #aaaaaa">@@ -5032,13 +4077,9 @@ prefix=$savePrefix
</span> exec_prefix=$saveExecprefix
# determine if the MPI library includes MPI-IO functions or not
-{ $as_echo "$as_me:$LINENO: checking for MPI-IO support in MPI" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI-IO support in MPI" >&5
</span> $as_echo_n "checking for MPI-IO support in MPI... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <mpi.h>
int
<span style="color: #aaaaaa">@@ -5056,53 +4097,22 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest$ac_exeext && {
</span>- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
<span style="color: #000000;background-color: #ffdddd">- }; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span> $as_echo "yes" >&6; }
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- { { $as_echo "$as_me:$LINENO: error: Darshan requires a version of MPI with MPI-IO support" >&5
-$as_echo "$as_me: error: Darshan requires a version of MPI with MPI-IO support" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "Darshan requires a version of MPI with MPI-IO support" "$LINENO" 5
</span>
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
<span style="color: #000000;background-color: #ffdddd">- conftest$ac_exeext conftest.$ac_ext
</span><span style="color: #000000;background-color: #ddffdd">+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
</span>
# At some point MPI-IO converted most API functions to be const correct. We
# need to test for this to determine how to define MPI-IO wrappers in
# Darshan. First we try compiling without cost qualifiers.
-{ $as_echo "$as_me:$LINENO: checking for MPI-IO prototypes without const qualifier" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI-IO prototypes without const qualifier" >&5
</span> $as_echo_n "checking for MPI-IO prototypes without const qualifier... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <mpi.h>
<span style="color: #aaaaaa">@@ -5118,42 +4128,18 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span> $as_echo "yes" >&6; }
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
# unable to compile without const qualifiers. Let's try again with
# const qualifiers.
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: checking for MPI-IO prototypes with const qualifier" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI-IO prototypes with const qualifier" >&5
</span> $as_echo_n "checking for MPI-IO prototypes with const qualifier... " >&6; }
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <mpi.h>
<span style="color: #aaaaaa">@@ -5169,245 +4155,91 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span> $as_echo "yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MPIIO_CONST 1
-_ACEOF
-
-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
<span style="color: #000000;background-color: #ddffdd">+$as_echo "#define HAVE_MPIIO_CONST 1" >>confdefs.h
</span>
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# determine if mpicc can create shared libraries that use MPI functions
-old_cflags="$CFLAGS"
-CFLAGS="$CFLAGS -shared -fpic -DPIC"
-old_libs="$LIBS"
-LIBS="$LIBS -ldl"
-{ $as_echo "$as_me:$LINENO: checking for shared libraries in MPI" >&5
-$as_echo_n "checking for shared libraries in MPI... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <mpi.h>
-int
-main ()
-{
-
<span style="color: #000000;background-color: #ffdddd">- int size;
- MPI_Comm_size(MPI_COMM_WORLD, &size);
</span>-
<span style="color: #000000;background-color: #ffdddd">- ;
- return 0;
</span>-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest$ac_exeext && {
</span>- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
<span style="color: #000000;background-color: #ffdddd">- }; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
</span>-$as_echo "yes" >&6; }
-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: mpicc doesn't support shared objects; disabling LD_PRELOAD library" >&5
</span>-$as_echo "$as_me: WARNING: mpicc doesn't support shared objects; disabling LD_PRELOAD library" >&2;}
<span style="color: #000000;background-color: #ffdddd">- DISABLE_LDPRELOAD="1"
</span>-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
<span style="color: #000000;background-color: #ffdddd">- conftest$ac_exeext conftest.$ac_ext
</span>-CFLAGS="$old_cflags"
-LIBS="$old_libs"
-
-# if this version of mpi defines an MPIO_Request type, then we assume that
-# we should use it in the nonblocking MPI-IO functions. This is necessary
-# for MPI 1.x implementations that did not use generalized requests yet in
-# MPI-IO. Later MPI implementations might typedef MPIO_Request to MPI_Request
-# so there is no harm in using the former if it is available there.
-{ $as_echo "$as_me:$LINENO: checking for MPIO_Request" >&5
-$as_echo_n "checking for MPIO_Request... " >&6; }
-if test "${ac_cv_type_MPIO_Request+set}" = set; then
<span style="color: #000000;background-color: #ffdddd">- $as_echo_n "(cached) " >&6
</span>-else
<span style="color: #000000;background-color: #ffdddd">- ac_cv_type_MPIO_Request=no
</span>-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <mpi.h>
-
-int
-main ()
-{
-if (sizeof (MPIO_Request))
<span style="color: #000000;background-color: #ffdddd">- return 0;
- ;
- return 0;
</span>-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+# determine if mpicc can create shared libraries that use MPI functions
+old_cflags="$CFLAGS"
+CFLAGS="$CFLAGS -shared -fpic -DPIC"
+old_libs="$LIBS"
+LIBS="$LIBS -ldl"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared libraries in MPI" >&5
+$as_echo_n "checking for shared libraries in MPI... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <mpi.h>
-
int
main ()
{
-if (sizeof ((MPIO_Request)))
- return 0;
<span style="color: #000000;background-color: #ddffdd">+
+ int size;
+ MPI_Comm_size(MPI_COMM_WORLD, &size);
+
</span> ;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- :
</span>-else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_MPIO_Request=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
<span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
</span> else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mpicc doesn't support shared objects; disabling LD_PRELOAD library" >&5
+$as_echo "$as_me: WARNING: mpicc doesn't support shared objects; disabling LD_PRELOAD library" >&2;}
+ DISABLE_LDPRELOAD="1"
</span>
fi
<span style="color: #000000;background-color: #ddffdd">+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+CFLAGS="$old_cflags"
+LIBS="$old_libs"
</span>
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_MPIO_Request" >&5
-$as_echo "$ac_cv_type_MPIO_Request" >&6; }
-if test "x$ac_cv_type_MPIO_Request" = x""yes; then
<span style="color: #000000;background-color: #ddffdd">+# if this version of mpi defines an MPIO_Request type, then we assume that
+# we should use it in the nonblocking MPI-IO functions. This is necessary
+# for MPI 1.x implementations that did not use generalized requests yet in
+# MPI-IO. Later MPI implementations might typedef MPIO_Request to MPI_Request
+# so there is no harm in using the former if it is available there.
+ac_fn_c_check_type "$LINENO" "MPIO_Request" "ac_cv_type_MPIO_Request" "#include <mpi.h>
+"
+if test "x$ac_cv_type_MPIO_Request" = xyes; then :
</span>
-cat >>confdefs.h <<\_ACEOF
-#define __D_MPI_REQUEST MPIO_Request
-_ACEOF
<span style="color: #000000;background-color: #ddffdd">+$as_echo "#define __D_MPI_REQUEST MPIO_Request" >>confdefs.h
</span>
else
-cat >>confdefs.h <<\_ACEOF
-#define __D_MPI_REQUEST MPI_Request
-_ACEOF
<span style="color: #000000;background-color: #ddffdd">+$as_echo "#define __D_MPI_REQUEST MPI_Request" >>confdefs.h
</span>
fi
# attempt to detect librarly naming convention in mpi compiler script
-{ $as_echo "$as_me:$LINENO: checking for old (pre-3.1.1) style MPICH library naming convention" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for old (pre-3.1.1) style MPICH library naming convention" >&5
</span> $as_echo_n "checking for old (pre-3.1.1) style MPICH library naming convention... " >&6; }
-if $CC -show foo.c -o foo |grep lmpich >& /dev/null; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: yes" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if $CC -show foo.c -o foo |grep lmpich >& /dev/null; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span> $as_echo "yes" >&6; }
MPICH_LIB_OLD=1
else
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: result: no" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
MPICH_LIB_OLD=0
fi
-
# check to see whether the bgq instrumentation module should be built
# Check whether --enable-bgq_mod was given.
-if test "${enable_bgq_mod+set}" = set; then
<span style="color: #000000;background-color: #ddffdd">+if test "${enable_bgq_mod+set}" = set; then :
</span> enableval=$enable_bgq_mod;
else
enable_bgq_mod=check
<span style="color: #aaaaaa">@@ -5415,13 +4247,9 @@ else
</span> fi
if test x$enable_bgq_mod != xno; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: checking for BG/Q environment" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BG/Q environment" >&5
</span> $as_echo_n "checking for BG/Q environment... " >&6; }
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
</span>-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
<span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#ifndef __bgq__
<span style="color: #aaaaaa">@@ -5436,41 +4264,17 @@ main ()
</span> return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
<span style="color: #000000;background-color: #ffdddd">- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
</span>-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
<span style="color: #000000;background-color: #ffdddd">- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
</span>- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
<span style="color: #000000;background-color: #ffdddd">- } && test -s conftest.$ac_objext; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span> $as_echo "yes" >&6; }
DARSHAN_USE_BGQ=1
else
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: failed program was:" >&5
</span>-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
<span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span> $as_echo "no" >&6; }
<span style="color: #000000;background-color: #ffdddd">- if test "x$enable_bgq_mod" = xyes; then
- { { $as_echo "$as_me:$LINENO: error: BG/Q module enabled in non-BG/Q environment" >&5
</span>-$as_echo "$as_me: error: BG/Q module enabled in non-BG/Q environment" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ if test "x$enable_bgq_mod" = xyes; then :
+ as_fn_error $? "BG/Q module enabled in non-BG/Q environment" "$LINENO" 5
</span> fi
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
<span style="color: #aaaaaa">@@ -5513,13 +4317,13 @@ _ACEOF
</span> case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
<span style="color: #000000;background-color: #ffdddd">- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
</span> $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
<span style="color: #000000;background-color: #ffdddd">- *) $as_unset $ac_var ;;
</span><span style="color: #000000;background-color: #ddffdd">+ *) { eval $ac_var=; unset $ac_var;} ;;
</span> esac ;;
esac
done
<span style="color: #aaaaaa">@@ -5527,8 +4331,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
</span> (set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
<span style="color: #000000;background-color: #ffdddd">- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
</span><span style="color: #000000;background-color: #ddffdd">+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
</span> sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
<span style="color: #aaaaaa">@@ -5550,12 +4354,23 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
</span> :end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
<span style="color: #000000;background-color: #ffdddd">- test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
</span> $as_echo "$as_me: updating cache $cache_file" >&6;}
<span style="color: #000000;background-color: #ffdddd">- cat confcache >$cache_file
</span><span style="color: #000000;background-color: #ddffdd">+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
</span> else
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
</span> $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
<span style="color: #aaaaaa">@@ -5569,14 +4384,15 @@ DEFS=-DHAVE_CONFIG_H
</span>
ac_libobjs=
ac_ltlibobjs=
<span style="color: #000000;background-color: #ddffdd">+U=
</span> for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
<span style="color: #000000;background-color: #ffdddd">- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
</span> done
LIBOBJS=$ac_libobjs
<span style="color: #aaaaaa">@@ -5585,13 +4401,14 @@ LTLIBOBJS=$ac_ltlibobjs
</span>
-: ${CONFIG_STATUS=./config.status}
<span style="color: #000000;background-color: #ddffdd">+: "${CONFIG_STATUS=./config.status}"
</span> ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
<span style="color: #000000;background-color: #ddffdd">+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
</span> $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
<span style="color: #000000;background-color: #ddffdd">+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
</span> #! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
<span style="color: #aaaaaa">@@ -5601,17 +4418,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
</span> debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
<span style="color: #000000;background-color: #ddffdd">+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
</span>
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ddffdd">+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
</span> emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
<span style="color: #aaaaaa">@@ -5619,23 +4437,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
</span> alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
<span style="color: #000000;background-color: #ffdddd">- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
</span><span style="color: #000000;background-color: #ddffdd">+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
</span> esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
<span style="color: #aaaaaa">@@ -5643,7 +4453,13 @@ export as_nl
</span> as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
<span style="color: #000000;background-color: #ddffdd">+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
</span> as_echo='printf %s\n'
as_echo_n='printf %s'
else
<span style="color: #aaaaaa">@@ -5654,7 +4470,7 @@ else
</span> as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
<span style="color: #000000;background-color: #ffdddd">- case $arg in
</span><span style="color: #000000;background-color: #ddffdd">+ case $arg in #(
</span> *"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
<span style="color: #aaaaaa">@@ -5677,13 +4493,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
</span> }
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ffdddd">- as_unset=unset
</span>-else
<span style="color: #000000;background-color: #ffdddd">- as_unset=false
</span>-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
<span style="color: #aaaaaa">@@ -5693,15 +4502,16 @@ fi
</span> IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
<span style="color: #000000;background-color: #ddffdd">+as_myself=
+case $0 in #((
</span> *[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
<span style="color: #000000;background-color: #ffdddd">- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
</span>-done
<span style="color: #000000;background-color: #ddffdd">+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
</span> IFS=$as_save_IFS
;;
<span style="color: #aaaaaa">@@ -5713,12 +4523,16 @@ if test "x$as_myself" = x; then
</span> fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }
</span><span style="color: #000000;background-color: #ddffdd">+ exit 1
</span> fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
<span style="color: #000000;background-color: #ddffdd">+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
</span> done
PS1='$ '
PS2='> '
<span style="color: #aaaaaa">@@ -5730,7 +4544,89 @@ export LC_ALL
</span> LANGUAGE=C
export LANGUAGE
-# Required to use basename.
<span style="color: #000000;background-color: #ddffdd">+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
</span> if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
<span style="color: #aaaaaa">@@ -5744,8 +4640,12 @@ else
</span> as_basename=false
fi
<span style="color: #000000;background-color: #ddffdd">+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
</span>
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
<span style="color: #aaaaaa">@@ -5765,76 +4665,25 @@ $as_echo X/"$0" |
</span> }
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
-
-
-
<span style="color: #000000;background-color: #ffdddd">- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
</span>-
<span style="color: #000000;background-color: #ffdddd">- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
</span>-
<span style="color: #000000;background-color: #ffdddd">- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
</span>-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ffdddd">- as_dirname=dirname
</span>-else
<span style="color: #000000;background-color: #ffdddd">- as_dirname=false
</span>-fi
<span style="color: #000000;background-color: #ddffdd">+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
</span>
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
<span style="color: #000000;background-color: #ddffdd">+case `echo -n x` in #(((((
</span> -n*)
<span style="color: #000000;background-color: #ffdddd">- case `echo 'x\c'` in
</span><span style="color: #000000;background-color: #ddffdd">+ case `echo 'xy\c'` in
</span> *c*) ECHO_T=' ';; # ECHO_T is single tab character.
<span style="color: #000000;background-color: #ffdddd">- *) ECHO_C='\c';;
</span><span style="color: #000000;background-color: #ddffdd">+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
</span> esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
<span style="color: #000000;background-color: #ffdddd">- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
</span>-else
<span style="color: #000000;background-color: #ffdddd">- as_expr=false
</span>-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
<span style="color: #aaaaaa">@@ -5849,49 +4698,85 @@ if (echo >conf$$.file) 2>/dev/null; then
</span> # ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
<span style="color: #000000;background-color: #ffdddd">- # In both cases, we have to default to `cp -p'.
</span><span style="color: #000000;background-color: #ddffdd">+ # In both cases, we have to default to `cp -pR'.
</span> ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
<span style="color: #000000;background-color: #ffdddd">- as_ln_s='cp -p'
</span><span style="color: #000000;background-color: #ddffdd">+ as_ln_s='cp -pR'
</span> elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
<span style="color: #000000;background-color: #ffdddd">- as_ln_s='cp -p'
</span><span style="color: #000000;background-color: #ddffdd">+ as_ln_s='cp -pR'
</span> fi
else
<span style="color: #000000;background-color: #ffdddd">- as_ln_s='cp -p'
</span><span style="color: #000000;background-color: #ddffdd">+ as_ln_s='cp -pR'
</span> fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
<span style="color: #000000;background-color: #ddffdd">+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
</span> if mkdir -p . 2>/dev/null; then
<span style="color: #000000;background-color: #ffdddd">- as_mkdir_p=:
</span><span style="color: #000000;background-color: #ddffdd">+ as_mkdir_p='mkdir -p "$as_dir"'
</span> else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
<span style="color: #000000;background-color: #ffdddd">- as_test_x='test -x'
</span>-else
<span style="color: #000000;background-color: #ffdddd">- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
</span>- test -d "$1/.";
<span style="color: #000000;background-color: #ffdddd">- else
</span>- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
<span style="color: #000000;background-color: #ffdddd">- '\'' sh
- '
</span>-fi
-as_executable_p=$as_test_x
<span style="color: #000000;background-color: #ddffdd">+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
</span>
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
<span style="color: #aaaaaa">@@ -5901,13 +4786,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
</span>
exec 6>&1
<span style="color: #000000;background-color: #ddffdd">+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
</span>
-# Save the log message, to keep $[0] and so on meaningful, and to
<span style="color: #000000;background-color: #ddffdd">+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
</span> # 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 3.0.0-pre1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
<span style="color: #000000;background-color: #ddffdd">+generated by GNU Autoconf 2.69. Invocation command line was
</span>
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
<span style="color: #aaaaaa">@@ -5938,13 +4829,15 @@ _ACEOF
</span>
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
<span style="color: #000000;background-color: #ddffdd">+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
</span>
-Usage: $0 [OPTION]... [FILE]...
<span style="color: #000000;background-color: #ddffdd">+Usage: $0 [OPTION]... [TAG]...
</span>
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
<span style="color: #000000;background-color: #ddffdd">+ --config print configuration, then exit
</span> -q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
<span style="color: #aaaaaa">@@ -5960,16 +4853,17 @@ $config_files
</span> Configuration headers:
$config_headers
-Report bugs to <bug-autoconf@gnu.org>."
<span style="color: #000000;background-color: #ddffdd">+Report bugs to the package provider."
</span>
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
<span style="color: #000000;background-color: #ddffdd">+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
</span> ac_cs_version="\\
darshan-runtime config.status 3.0.0-pre1
-configured by $0, generated by GNU Autoconf 2.63,
<span style="color: #000000;background-color: #ffdddd">- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
</span><span style="color: #000000;background-color: #ddffdd">+configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
</span>
-Copyright (C) 2008 Free Software Foundation, Inc.
<span style="color: #000000;background-color: #ddffdd">+Copyright (C) 2012 Free Software Foundation, Inc.
</span> This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
<span style="color: #aaaaaa">@@ -5985,11 +4879,16 @@ ac_need_defaults=:
</span> while test $# != 0
do
case $1 in
<span style="color: #000000;background-color: #ffdddd">- --*=*)
</span><span style="color: #000000;background-color: #ddffdd">+ --*=?*)
</span> ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
<span style="color: #000000;background-color: #ddffdd">+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
</span> *)
ac_option=$1
ac_optarg=$2
<span style="color: #aaaaaa">@@ -6003,27 +4902,29 @@ do
</span> ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
<span style="color: #000000;background-color: #ddffdd">+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
</span> --debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
<span style="color: #000000;background-color: #ddffdd">+ '') as_fn_error $? "missing file argument" ;;
</span> esac
<span style="color: #000000;background-color: #ffdddd">- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_append CONFIG_FILES " '$ac_optarg'"
</span> ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
<span style="color: #000000;background-color: #ffdddd">- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
</span> ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me: error: ambiguous option: $1
</span>-Try \`$0 --help' for more information." >&2
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; };;
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
</span> --help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
<span style="color: #aaaaaa">@@ -6031,11 +4932,10 @@ Try \`$0 --help' for more information." >&2
</span> ac_cs_silent=: ;;
# This is an error.
<span style="color: #000000;background-color: #ffdddd">- -*) { $as_echo "$as_me: error: unrecognized option: $1
</span>-Try \`$0 --help' for more information." >&2
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; } ;;
</span><span style="color: #000000;background-color: #ddffdd">+ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
</span>
<span style="color: #000000;background-color: #ffdddd">- *) ac_config_targets="$ac_config_targets $1"
</span><span style="color: #000000;background-color: #ddffdd">+ *) as_fn_append ac_config_targets " $1"
</span> ac_need_defaults=false ;;
esac
<span style="color: #aaaaaa">@@ -6052,7 +4952,7 @@ fi
</span> _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
<span style="color: #000000;background-color: #ffdddd">- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
</span><span style="color: #000000;background-color: #ddffdd">+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
</span> shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
<span style="color: #aaaaaa">@@ -6099,9 +4999,7 @@ do
</span> "share/mpi-profile/darshan-bg-cxx.conf") CONFIG_FILES="$CONFIG_FILES share/mpi-profile/darshan-bg-cxx.conf" ;;
"share/mpi-profile/darshan-bg-f.conf") CONFIG_FILES="$CONFIG_FILES share/mpi-profile/darshan-bg-f.conf" ;;
<span style="color: #000000;background-color: #ffdddd">- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
</span>-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; };;
</span><span style="color: #000000;background-color: #ddffdd">+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
</span> esac
done
<span style="color: #aaaaaa">@@ -6123,26 +5021,24 @@ fi
</span> # after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
<span style="color: #000000;background-color: #ffdddd">- tmp=
</span><span style="color: #000000;background-color: #ddffdd">+ tmp= ac_tmp=
</span> trap 'exit_status=$?
<span style="color: #000000;background-color: #ffdddd">- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
</span><span style="color: #000000;background-color: #ddffdd">+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
</span> ' 0
<span style="color: #000000;background-color: #ffdddd">- trap '{ (exit 1); exit 1; }' 1 2 13 15
</span><span style="color: #000000;background-color: #ddffdd">+ trap 'as_fn_exit 1' 1 2 13 15
</span> }
# Create a (secure) tmp directory for tmp files.
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
<span style="color: #000000;background-color: #ffdddd">- test -n "$tmp" && test -d "$tmp"
</span><span style="color: #000000;background-color: #ddffdd">+ test -d "$tmp"
</span> } ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} ||
-{
<span style="color: #000000;background-color: #ffdddd">- $as_echo "$as_me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
</span>-}
<span style="color: #000000;background-color: #ddffdd">+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
</span>
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
<span style="color: #aaaaaa">@@ -6150,7 +5046,13 @@ $debug ||
</span> if test -n "$CONFIG_FILES"; then
-ac_cr='
'
<span style="color: #000000;background-color: #ddffdd">+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
</span> ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
ac_cs_awk_cr='\\r'
<span style="color: #aaaaaa">@@ -6158,7 +5060,7 @@ else
</span> ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
<span style="color: #000000;background-color: #ddffdd">+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
</span> _ACEOF
<span style="color: #aaaaaa">@@ -6167,24 +5069,18 @@ _ACEOF
</span> echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
</span>-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span>-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
<span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
</span> ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
</span>-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
</span>
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
</span>-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
</span> else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
<span style="color: #aaaaaa">@@ -6192,7 +5088,7 @@ done
</span> rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
<span style="color: #000000;background-color: #ddffdd">+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
</span> _ACEOF
sed -n '
h
<span style="color: #aaaaaa">@@ -6206,7 +5102,7 @@ s/'"$ac_delim"'$//
</span> t delim
:nl
h
-s/\(.\{148\}\).*/\1/
<span style="color: #000000;background-color: #ddffdd">+s/\(.\{148\}\)..*/\1/
</span> t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
<span style="color: #aaaaaa">@@ -6220,7 +5116,7 @@ s/.\{148\}//
</span> t nl
:delim
h
-s/\(.\{148\}\).*/\1/
<span style="color: #000000;background-color: #ddffdd">+s/\(.\{148\}\)..*/\1/
</span> t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
<span style="color: #aaaaaa">@@ -6240,7 +5136,7 @@ t delim
</span> rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
<span style="color: #000000;background-color: #ddffdd">+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
</span> for (key in S) S_is_set[key] = 1
FS = ""
<span style="color: #aaaaaa">@@ -6272,23 +5168,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
</span> sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
<span style="color: #000000;background-color: #ffdddd">- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
</span>-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
</span> _ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
<span style="color: #000000;background-color: #ddffdd">+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
</span> # trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
<span style="color: #000000;background-color: #ffdddd">- ac_vpsub='/^[ ]*VPATH[ ]*=/{
</span>-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
<span style="color: #000000;background-color: #ddffdd">+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
</span> s/:*$//
<span style="color: #000000;background-color: #ddffdd">+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
</span> s/^[^=]*=[ ]*$//
}'
fi
<span style="color: #aaaaaa">@@ -6300,7 +5202,7 @@ fi # test -n "$CONFIG_FILES"
</span> # No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
<span style="color: #000000;background-color: #ddffdd">+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
</span> BEGIN {
_ACEOF
<span style="color: #aaaaaa">@@ -6312,13 +5214,11 @@ _ACEOF
</span> # handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
<span style="color: #000000;background-color: #ffdddd">- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
</span><span style="color: #000000;background-color: #ddffdd">+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
</span> break
elif $ac_last_try; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
</span>-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
</span> else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
<span style="color: #aaaaaa">@@ -6403,9 +5303,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
</span> _ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
</span>-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
</span> fi # test -n "$CONFIG_HEADERS"
<span style="color: #aaaaaa">@@ -6418,9 +5316,7 @@ do
</span> esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
<span style="color: #000000;background-color: #ffdddd">- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
</span>-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; };;
</span><span style="color: #000000;background-color: #ddffdd">+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
</span> :[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
<span style="color: #aaaaaa">@@ -6439,7 +5335,7 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
</span> for ac_f
do
case $ac_f in
<span style="color: #000000;background-color: #ffdddd">- -) ac_f="$tmp/stdin";;
</span><span style="color: #000000;background-color: #ddffdd">+ -) ac_f="$ac_tmp/stdin";;
</span> *) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
<span style="color: #aaaaaa">@@ -6448,12 +5344,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
</span> [\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; };;
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
</span> esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
<span style="color: #000000;background-color: #ffdddd">- ac_file_inputs="$ac_file_inputs '$ac_f'"
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_append ac_file_inputs " '$ac_f'"
</span> done
# Let's still pretend it is `configure' which instantiates (i.e., don't
<span style="color: #aaaaaa">@@ -6464,7 +5358,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
</span> `' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
</span> $as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
<span style="color: #aaaaaa">@@ -6476,10 +5370,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
</span> esac
case $ac_tag in
<span style="color: #000000;background-color: #ffdddd">- *:-:* | *:-) cat >"$tmp/stdin" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
</span>-$as_echo "$as_me: error: could not create $ac_file" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; } ;;
</span><span style="color: #000000;background-color: #ddffdd">+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
</span> esac
;;
esac
<span style="color: #aaaaaa">@@ -6507,47 +5399,7 @@ $as_echo X"$ac_file" |
</span> q
}
s/.*/./; q'`
<span style="color: #000000;background-color: #ffdddd">- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
</span>-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
<span style="color: #000000;background-color: #ffdddd">- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
</span>- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
<span style="color: #000000;background-color: #ffdddd">- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
</span>-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_dir="$ac_dir"; as_fn_mkdir_p
</span> ac_builddir=.
case "$ac_dir" in
<span style="color: #aaaaaa">@@ -6599,7 +5451,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
</span> # If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-
ac_sed_dataroot='
/datarootdir/ {
p
<span style="color: #aaaaaa">@@ -6609,12 +5460,11 @@ ac_sed_dataroot='
</span> /@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p
-'
<span style="color: #000000;background-color: #ddffdd">+/@mandir@/p'
</span> case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
</span> $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
<span style="color: #aaaaaa">@@ -6624,7 +5474,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
</span> s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
<span style="color: #000000;background-color: #ffdddd">- s&\\\${datarootdir}&$datarootdir&g' ;;
</span><span style="color: #000000;background-color: #ddffdd">+ s&\\\${datarootdir}&$datarootdir&g' ;;
</span> esac
_ACEOF
<span style="color: #aaaaaa">@@ -6651,27 +5501,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
</span> s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
<span style="color: #000000;background-color: #ffdddd">- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
</span>-$as_echo "$as_me: error: could not create $ac_file" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
</span>
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
<span style="color: #000000;background-color: #ffdddd">- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
</span>-which seems to be undefined. Please make sure it is defined." >&5
<span style="color: #000000;background-color: #ddffdd">+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&5
</span> $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
<span style="color: #000000;background-color: #ddffdd">+which seems to be undefined. Please make sure it is defined" >&2;}
</span>
<span style="color: #000000;background-color: #ffdddd">- rm -f "$tmp/stdin"
</span><span style="color: #000000;background-color: #ddffdd">+ rm -f "$ac_tmp/stdin"
</span> case $ac_file in
<span style="color: #000000;background-color: #ffdddd">- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
</span><span style="color: #000000;background-color: #ddffdd">+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
</span> esac \
<span style="color: #000000;background-color: #ffdddd">- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
</span>-$as_echo "$as_me: error: could not create $ac_file" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
</span> ;;
:H)
#
<span style="color: #aaaaaa">@@ -6680,27 +5527,21 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
</span> if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
<span style="color: #000000;background-color: #ffdddd">- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
</span>-$as_echo "$as_me: error: could not create $ac_file" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
</span> $as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
<span style="color: #000000;background-color: #ffdddd">- mv "$tmp/config.h" "$ac_file" \
</span>- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ mv "$ac_tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
</span> fi
else
$as_echo "/* $configure_input */" \
<span style="color: #000000;background-color: #ffdddd">- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
</span>-$as_echo "$as_me: error: could not create -" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
</span> fi
;;
<span style="color: #aaaaaa">@@ -6710,15 +5551,12 @@ $as_echo "$as_me: error: could not create -" >&2;}
</span> done # for ac_tag
-{ (exit 0); exit 0; }
<span style="color: #000000;background-color: #ddffdd">+as_fn_exit 0
</span> _ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
</span>-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
<span style="color: #000000;background-color: #ffdddd">- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
</span>
# configure is writing to config.log, and then calls config.status.
<span style="color: #aaaaaa">@@ -6739,10 +5577,10 @@ if test "$no_create" != yes; then
</span> exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
<span style="color: #000000;background-color: #ffdddd">- $ac_cs_success || { (exit 1); exit 1; }
</span><span style="color: #000000;background-color: #ddffdd">+ $ac_cs_success || as_fn_exit 1
</span> fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
</span><span style="color: #000000;background-color: #ddffdd">+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
</span> $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
</code></pre>
<br>
</li>
<li id='diff-3'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-3'>
<strong>
darshan-runtime/darshan-runtime-config.h.in
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-runtime/darshan-runtime-config.h.in
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-runtime/darshan-runtime-config.h.in
</span><span style="color: #aaaaaa">@@ -63,6 +63,9 @@
</span> /* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
<span style="color: #000000;background-color: #ddffdd">+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
</span> /* Define to the version of this package. */
#undef PACKAGE_VERSION
</code></pre>
<br>
</li>
<li id='diff-4'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-4'>
<strong>
darshan-runtime/lib/darshan-core.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-runtime/lib/darshan-core.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-runtime/lib/darshan-core.c
</span><span style="color: #aaaaaa">@@ -261,6 +261,7 @@ void darshan_core_shutdown()
</span> double header1, header2;
double tm_end;
uint64_t gz_fp = 0;
<span style="color: #000000;background-color: #ddffdd">+ unsigned char tmp_partial_flag;
</span> MPI_File log_fh;
MPI_Status status;
<span style="color: #aaaaaa">@@ -549,6 +550,13 @@ void darshan_core_shutdown()
</span> mod2[i] = DARSHAN_MPI_CALL(PMPI_Wtime)();
}
<span style="color: #000000;background-color: #ddffdd">+ /* run a reduction to determine if any application processes had to set the
+ * partial flag. this happens when a process has tracked too many records
+ * at once and cannot track new records
+ */
+ DARSHAN_MPI_CALL(PMPI_Reduce)(&(final_core->log_header.partial_flag),
+ &tmp_partial_flag, 1, MPI_UNSIGNED_CHAR, MPI_MAX, 0, MPI_COMM_WORLD);
+
</span> if(internal_timing_flag)
header1 = DARSHAN_MPI_CALL(PMPI_Wtime)();
/* rank 0 is responsible for writing the log header */
<span style="color: #aaaaaa">@@ -558,6 +566,7 @@ void darshan_core_shutdown()
</span> strcpy(final_core->log_header.version_string, DARSHAN_LOG_VERSION);
final_core->log_header.magic_nr = DARSHAN_MAGIC_NR;
final_core->log_header.comp_type = DARSHAN_ZLIB_COMP;
<span style="color: #000000;background-color: #ddffdd">+ final_core->log_header.partial_flag = tmp_partial_flag;
</span>
all_ret = DARSHAN_MPI_CALL(PMPI_File_write_at)(log_fh, 0, &(final_core->log_header),
sizeof(struct darshan_header), MPI_BYTE, &status);
</code></pre>
<br>
</li>
<li id='diff-5'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-5'>
<strong>
darshan-util/Makefile.in
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-util/Makefile.in
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-util/Makefile.in
</span><span style="color: #aaaaaa">@@ -1,4 +1,4 @@
</span>-all: libdarshan-util.a darshan-analyzer darshan-convert darshan-parser jenkins-hash-gen
<span style="color: #000000;background-color: #ddffdd">+all: libdarshan-util.a darshan-null-logutils.o darshan-analyzer darshan-convert darshan-parser jenkins-hash-gen
</span>
DESTDIR =
srcdir = @srcdir@
<span style="color: #aaaaaa">@@ -21,7 +21,7 @@ DARSHAN_ENABLE_SHARED=@DARSHAN_ENABLE_SHARED@
</span> VPATH = $(srcdir)
ifeq ($(DARSHAN_ENABLE_SHARED),1)
-all: libdarshan-util.so
<span style="color: #000000;background-color: #ddffdd">+all: libdarshan-util.so darshan-null-logutils.po
</span> endif
cp_zlib_link_flags = @__DARSHAN_ZLIB_LINK_FLAGS@
cp_zlib_include_flags = @__DARSHAN_ZLIB_INCLUDE_FLAGS@
<span style="color: #aaaaaa">@@ -49,6 +49,11 @@ darshan-logutils.o: darshan-logutils.c darshan-logutils.h $(DARSHAN_LOG_FORMAT)
</span> darshan-logutils.po: darshan-logutils.c darshan-logutils.h $(DARSHAN_LOG_FORMAT) | uthash-1.9.2
$(CC) $(CFLAGS_SHARED) -c $< -o $@
<span style="color: #000000;background-color: #ddffdd">+darshan-null-logutils.o: darshan-null-logutils.c darshan-logutils.h darshan-null-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-null-log-format.h | uthash-1.9.2
+ $(CC) $(CFLAGS) -c $< -o $@
+darshan-null-logutils.po: darshan-null-logutils.c darshan-logutils.h darshan-null-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-null-log-format.h | uthash-1.9.2
+ $(CC) $(CFLAGS_SHARED) -c $< -o $@
+
</span> darshan-posix-logutils.o: darshan-posix-logutils.c darshan-logutils.h darshan-posix-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-posix-log-format.h | uthash-1.9.2
$(CC) $(CFLAGS) -c $< -o $@
darshan-posix-logutils.po: darshan-posix-logutils.c darshan-logutils.h darshan-posix-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-posix-log-format.h | uthash-1.9.2
<span style="color: #aaaaaa">@@ -135,7 +140,7 @@ endif
</span>
clean::
- rm -f *.o *.a darshan-analyzer darshan-convert darshan-parser jenkins-hash-gen
<span style="color: #000000;background-color: #ddffdd">+ rm -f *.o *.po *.a darshan-analyzer darshan-convert darshan-parser jenkins-hash-gen
</span>
distclean:: clean
rm -f darshan-runtime-config.h aclocal.m4 autom4te.cache/* config.status config.log Makefile util/bin/darshan-job-summary.pl
</code></pre>
<br>
</li>
<li id='diff-6'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-6'>
<strong>
darshan-util/darshan-convert.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-util/darshan-convert.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-util/darshan-convert.c
</span><span style="color: #aaaaaa">@@ -251,7 +251,7 @@ int main(int argc, char **argv)
</span> return(-1);
comp_type = bzip2 ? comp_type = DARSHAN_BZIP2_COMP : DARSHAN_ZLIB_COMP;
<span style="color: #000000;background-color: #ffdddd">- outfile = darshan_log_create(outfile_name, comp_type);
</span><span style="color: #000000;background-color: #ddffdd">+ outfile = darshan_log_create(outfile_name, comp_type, infile->partial_flag);
</span> if(!outfile)
{
darshan_log_close(infile);
</code></pre>
<br>
</li>
<li id='diff-7'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-7'>
<strong>
darshan-util/darshan-job-summary/bin/darshan-job-summary.pl.in
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-util/darshan-job-summary/bin/darshan-job-summary.pl.in
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-util/darshan-job-summary/bin/darshan-job-summary.pl.in
</span><span style="color: #aaaaaa">@@ -36,6 +36,7 @@ my %posix_access_hash = ();
</span> my %mpiio_access_hash = ();
my @access_size = ();
my %hash_files = ();
<span style="color: #000000;background-color: #ddffdd">+my $partial_flag = 0;
</span>
# data structures for calculating performance
my %hash_unique_file_time = ();
<span style="color: #aaaaaa">@@ -93,10 +94,21 @@ while($line = <PARSE_OUT>)
</span> {
if ($line =~ /^# exe: /)
{
<span style="color: #000000;background-color: #ddffdd">+ $f_save = "";
</span> ($junk, $cmdline) = split(':', $line, 2);
<span style="color: #000000;background-color: #ddffdd">+
+ print("PRE: $cmdline\n");
</span> # add escape characters if needed for special characters in
# command line
<span style="color: #000000;background-color: #ffdddd">- $cmdline = encode('latex', $cmdline);
</span><span style="color: #000000;background-color: #ddffdd">+ if ($cmdline =~ /<unknown args>/)
+ {
+ # fortran "<unknown args> seems to throw things off,
+ # so we don't encode that if it's present
+ $f_save = substr($cmdline, -14);
+ $cmdline = substr($cmdline, 0, -14);
+ }
+ $cmdline = encode('latex', $cmdline) . $f_save;
+ print("POST: $cmdline\n");
</span> }
elsif ($line =~ /^# nprocs: /)
{
<span style="color: #aaaaaa">@@ -123,6 +135,10 @@ while($line = <PARSE_OUT>)
</span> ($junk, $version) = split(':', $line, 2);
$version =~ s/^\s+//;
}
<span style="color: #000000;background-color: #ddffdd">+ elsif ($line =~ /^# \*WARNING\*: This Darshan log contains incomplete data!/)
+ {
+ $partial_flag = 1;
+ }
</span> }
else
{
<span style="color: #aaaaaa">@@ -952,12 +968,19 @@ my $latex_cmd_line = "\"\\def\\titlecmd{$cmd} \\
</span> \\input{summary.tex}\" \\
@__DARSHAN_PDFLATEX_HALT_ON_ERROR@";
<span style="color: #000000;background-color: #ddffdd">+if ($partial_flag == 1)
+{
+ my $partial_log_flags = "\\def\\incompletelog{1} \\";
+ $latex_cmd_line = substr($latex_cmd_line, 0, 1) . $partial_log_flags . substr($latex_cmd_line, 1);
+}
+
</span> if (defined $summary{MPIIO_INDEP_OPENS})
{
<span style="color: #000000;background-color: #ffdddd">- my $mpiio_latex_flags = "\\def\\inclmpiio{1} \\\n";
</span><span style="color: #000000;background-color: #ddffdd">+ my $mpiio_latex_flags = "\\def\\inclmpiio{1} \\";
</span> $latex_cmd_line = substr($latex_cmd_line, 0, 1) . $mpiio_latex_flags . substr($latex_cmd_line, 1);
}
<span style="color: #000000;background-color: #ddffdd">+
</span> $system_rc = system "$pdflatex $latex_cmd_line > latex.output";
if($system_rc)
{
</code></pre>
<br>
</li>
<li id='diff-8'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-8'>
<strong>
darshan-util/darshan-job-summary/share/summary.tex
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-util/darshan-job-summary/share/summary.tex
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-util/darshan-job-summary/share/summary.tex
</span><span style="color: #aaaaaa">@@ -6,6 +6,7 @@
</span> \usepackage{subfigure}
\usepackage{multirow}
\usepackage{threeparttable}
<span style="color: #000000;background-color: #ddffdd">+\usepackage{color}
</span>
%
% GET THE MARGINS RIGHT, THE UGLY WAY
<span style="color: #aaaaaa">@@ -32,6 +33,17 @@
</span>
\pagestyle{fancy}
<span style="color: #000000;background-color: #ddffdd">+\ifdefined\incompletelog
+\twocolumn[
+\vspace{3.5in}
+\center
+{\bf \textcolor{red}{WARNING}}: This Darshan log contains incomplete data
+which may skew results in this document.
+\endcenter
+]
+\newpage
+\fi
+
</span> \begin{figure*}[!h]
\centering
\subfigure
</code></pre>
<br>
</li>
<li id='diff-9'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-9'>
<strong>
darshan-util/darshan-logutils.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-util/darshan-logutils.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-util/darshan-logutils.c
</span><span style="color: #aaaaaa">@@ -86,8 +86,6 @@ static int darshan_log_bzip2_flush(darshan_fd fd, int region_id);
</span> static int darshan_log_dzload(darshan_fd fd, struct darshan_log_map map);
static int darshan_log_dzunload(darshan_fd fd, struct darshan_log_map *map_p);
-/* TODO: check comments on functions to make sure they are right /cleanup */
-
/* each module's implementation of the darshan logutil functions */
#define X(a, b, c) c,
struct darshan_mod_logutil_funcs *mod_logutils[DARSHAN_MAX_MODS] =
<span style="color: #aaaaaa">@@ -161,7 +159,8 @@ darshan_fd darshan_log_open(const char *name)
</span> *
* returns file descriptor on success, NULL on failure
*/
-darshan_fd darshan_log_create(const char *name, enum darshan_comp_type comp_type)
<span style="color: #000000;background-color: #ddffdd">+darshan_fd darshan_log_create(const char *name, enum darshan_comp_type comp_type,
+ int partial_flag)
</span> {
darshan_fd tmp_fd;
int ret;
<span style="color: #aaaaaa">@@ -190,6 +189,7 @@ darshan_fd darshan_log_create(const char *name, enum darshan_comp_type comp_type
</span> }
tmp_fd->state->creat_flag = 1;
tmp_fd->state->comp_type = comp_type;
<span style="color: #000000;background-color: #ddffdd">+ tmp_fd->partial_flag = partial_flag;
</span> strncpy(tmp_fd->state->logfile_path, name, PATH_MAX);
/* position file pointer to prealloc space for the log file header
<span style="color: #aaaaaa">@@ -685,10 +685,10 @@ int darshan_log_puthash(darshan_fd fd, struct darshan_record_ref *hash)
</span> *
* get a chunk of module data from the darshan log file
*
<span style="color: #000000;background-color: #ffdddd">- * returns 0 on success, -1 on failure
</span><span style="color: #000000;background-color: #ddffdd">+ * returns number of bytes read on success, -1 on failure
</span> */
int darshan_log_getmod(darshan_fd fd, darshan_module_id mod_id,
<span style="color: #000000;background-color: #ffdddd">- void *buf, int len)
</span><span style="color: #000000;background-color: #ddffdd">+ void *mod_buf, int mod_buf_sz)
</span> {
struct darshan_fd_int_state *state = fd->state;
int ret;
<span style="color: #aaaaaa">@@ -705,7 +705,7 @@ int darshan_log_getmod(darshan_fd fd, darshan_module_id mod_id,
</span> return(0); /* no data corresponding to this mod_id */
/* read this module's data from the log file */
<span style="color: #000000;background-color: #ffdddd">- ret = darshan_log_dzread(fd, mod_id, buf, len);
</span><span style="color: #000000;background-color: #ddffdd">+ ret = darshan_log_dzread(fd, mod_id, mod_buf, mod_buf_sz);
</span> if(ret < 0)
{
fprintf(stderr,
<span style="color: #aaaaaa">@@ -727,7 +727,7 @@ int darshan_log_getmod(darshan_fd fd, darshan_module_id mod_id,
</span> * should be called in order of increasing module identifiers,
* as the darshan log file format expects this ordering.
*
<span style="color: #000000;background-color: #ffdddd">- * returns 0 on success, -1 on failure
</span><span style="color: #000000;background-color: #ddffdd">+ * returns number of bytes written on success, -1 on failure
</span> */
int darshan_log_putmod(darshan_fd fd, darshan_module_id mod_id,
void *mod_buf, int mod_buf_sz)
<span style="color: #aaaaaa">@@ -762,7 +762,6 @@ int darshan_log_putmod(darshan_fd fd, darshan_module_id mod_id,
</span> *
* close an open darshan file descriptor, freeing any resources
*
<span style="color: #000000;background-color: #ffdddd">- * returns 0 on success, -1 on failure
</span> */
void darshan_log_close(darshan_fd fd)
{
<span style="color: #aaaaaa">@@ -885,6 +884,7 @@ static int darshan_log_getheader(darshan_fd fd)
</span> }
state->comp_type = header.comp_type;
<span style="color: #000000;background-color: #ddffdd">+ fd->partial_flag = header.partial_flag;
</span>
/* save the mapping of data within log file to this file descriptor */
fd->job_map.off = sizeof(struct darshan_header);
<span style="color: #aaaaaa">@@ -916,6 +916,7 @@ static int darshan_log_putheader(darshan_fd fd)
</span> strcpy(header.version_string, DARSHAN_LOG_VERSION);
header.magic_nr = DARSHAN_MAGIC_NR;
header.comp_type = state->comp_type;
<span style="color: #000000;background-color: #ddffdd">+ header.partial_flag = fd->partial_flag;
</span>
/* copy the mapping information to the header */
memcpy(&header.rec_map, &fd->rec_map, sizeof(struct darshan_log_map));
</code></pre>
<br>
</li>
<li id='diff-10'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-10'>
<strong>
darshan-util/darshan-logutils.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-util/darshan-logutils.h
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-util/darshan-logutils.h
</span><span style="color: #aaaaaa">@@ -27,6 +27,8 @@ struct darshan_fd_s
</span> /* flag indicating whether byte swapping needs to be
* performed on log file data */
int swap_flag;
<span style="color: #000000;background-color: #ddffdd">+ /* flag indicating whether a log file contains partial data */
+ int partial_flag;
</span> /* log file offset/length maps for each log file region */
struct darshan_log_map job_map;
struct darshan_log_map rec_map;
<span style="color: #aaaaaa">@@ -48,13 +50,18 @@ struct darshan_record_ref
</span> */
struct darshan_mod_logutil_funcs
{
<span style="color: #000000;background-color: #ffdddd">- /* retrieve a single module record from the log file */
</span><span style="color: #000000;background-color: #ddffdd">+ /* retrieve a single module record from the log file.
+ * return 1 on successful read of record, 0 on no more
+ * module data, -1 on error
+ */
</span> int (*log_get_record)(
darshan_fd fd,
void* buf,
darshan_record_id* rec_id
);
<span style="color: #000000;background-color: #ffdddd">- /* put a single module record into the log file */
</span><span style="color: #000000;background-color: #ddffdd">+ /* put a single module record into the log file.
+ * return 0 on success, -1 on error
+ */
</span> int (*log_put_record)(
darshan_fd fd,
void *buf
<span style="color: #aaaaaa">@@ -77,7 +84,8 @@ extern struct darshan_mod_logutil_funcs *mod_logutils[];
</span> #include "darshan-bgq-logutils.h"
darshan_fd darshan_log_open(const char *name);
-darshan_fd darshan_log_create(const char *name, enum darshan_comp_type comp_type);
<span style="color: #000000;background-color: #ddffdd">+darshan_fd darshan_log_create(const char *name, enum darshan_comp_type comp_type,
+ int partial_flag);
</span> int darshan_log_getjob(darshan_fd fd, struct darshan_job *job);
int darshan_log_putjob(darshan_fd fd, struct darshan_job *job);
int darshan_log_getexe(darshan_fd fd, char *buf);
<span style="color: #aaaaaa">@@ -89,7 +97,7 @@ int darshan_log_putmounts(darshan_fd fd, char** mnt_pts,
</span> int darshan_log_gethash(darshan_fd fd, struct darshan_record_ref **hash);
int darshan_log_puthash(darshan_fd fd, struct darshan_record_ref *hash);
int darshan_log_getmod(darshan_fd fd, darshan_module_id mod_id,
<span style="color: #000000;background-color: #ffdddd">- void *buf, int len);
</span><span style="color: #000000;background-color: #ddffdd">+ void *mod_buf, int mod_buf_sz);
</span> int darshan_log_putmod(darshan_fd fd, darshan_module_id mod_id,
void *mod_buf, int mod_buf_sz);
void darshan_log_close(darshan_fd file);
</code></pre>
<br>
</li>
<li id='diff-11'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-11'>
<strong>
darshan-util/darshan-null-logutils.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- /dev/null
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-util/darshan-null-logutils.c
</span><span style="color: #aaaaaa">@@ -0,0 +1,143 @@
</span><span style="color: #000000;background-color: #ddffdd">+/*
+ * Copyright (C) 2015 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
+#define _GNU_SOURCE
+#include "darshan-util-config.h"
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include "darshan-null-logutils.h"
+
+/* integer counter name strings for the NULL module */
+#define X(a) #a,
+char *null_counter_names[] = {
+ NULL_COUNTERS
+};
+
+/* floating point counter name strings for the NULL module */
+char *null_f_counter_names[] = {
+ NULL_F_COUNTERS
+};
+#undef X
+
+/* prototypes for each of the NULL module's logutil functions */
+static int darshan_log_get_null_record(darshan_fd fd, void* null_buf,
+ darshan_record_id* rec_id);
+static int darshan_log_put_null_record(darshan_fd fd, void* null_buf);
+static void darshan_log_print_null_record(void *file_rec,
+ char *file_name, char *mnt_pt, char *fs_type);
+
+/* structure storing each function needed for implementing the darshan
+ * logutil interface. these functions are used for reading, writing, and
+ * printing module data in a consistent manner.
+ */
+struct darshan_mod_logutil_funcs null_logutils =
+{
+ .log_get_record = &darshan_log_get_null_record,
+ .log_put_record = &darshan_log_put_null_record,
+ .log_print_record = &darshan_log_print_null_record,
+};
+
+/* retrieve a NULL record from log file descriptor 'fd', storing the
+ * buffer in 'null_buf' and the corresponding Darshan record id in
+ * 'rec_id'. Return 1 on successful record read, .
+ */
+static int darshan_log_get_null_record(darshan_fd fd, void* null_buf,
+ darshan_record_id* rec_id)
+{
+ struct darshan_null_record *rec;
+ int i;
+ int ret;
+
+ /* read a NULL module record from the darshan log file */
+ ret = darshan_log_getmod(fd, DARSHAN_NULL_MOD, null_buf,
+ sizeof(struct darshan_null_record));
+ if(ret < 0)
+ return(-1);
+ else if(ret < sizeof(struct darshan_null_record))
+ return(0);
+ else
+ {
+ /* if the read was successful, do any necessary byte-swapping */
+ rec = (struct darshan_null_record *)null_buf;
+ if(fd->swap_flag)
+ {
+ /* swap bytes if necessary */
+ DARSHAN_BSWAP64(&rec->f_id);
+ DARSHAN_BSWAP64(&rec->rank);
+ for(i=0; i<NULL_NUM_INDICES; i++)
+ DARSHAN_BSWAP64(&rec->counters[i]);
+ for(i=0; i<NULL_F_NUM_INDICES; i++)
+ DARSHAN_BSWAP64(&rec->fcounters[i]);
+ }
+
+ /* set the output record id */
+ *rec_id = rec->f_id;
+ return(1);
+ }
+}
+
+/* write the NULL record stored in 'null_buf' to log file descriptor 'fd'.
+ * Return 0 on success, -1 on failure
+ */
+static int darshan_log_put_null_record(darshan_fd fd, void* null_buf)
+{
+ struct darshan_null_record *rec = (struct darshan_null_record *)null_buf;
+ int ret;
+
+ /* append NULL record to darshan log file */
+ ret = darshan_log_putmod(fd, DARSHAN_NULL_MOD, rec,
+ sizeof(struct darshan_null_record));
+ if(ret < 0)
+ return(-1);
+
+ return(0);
+}
+
+/* print all I/O data record statistics for the given NULL record */
+static void darshan_log_print_null_record(void *file_rec, char *file_name,
+ char *mnt_pt, char *fs_type)
+{
+ int i;
+ struct darshan_null_record *null_rec =
+ (struct darshan_null_record *)file_rec;
+
+ /* print each of the integer and floating point counters for the NULL module */
+ for(i=0; i<NULL_NUM_INDICES; i++)
+ {
+ /* macro defined in darshan-logutils.h */
+ DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
+ null_rec->rank, null_rec->f_id, null_counter_names[i],
+ null_rec->counters[i], file_name, mnt_pt, fs_type);
+ }
+
+ for(i=0; i<NULL_F_NUM_INDICES; i++)
+ {
+ /* macro defined in darshan-logutils.h */
+ DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_NULL_MOD],
+ null_rec->rank, null_rec->f_id, null_f_counter_names[i],
+ null_rec->fcounters[i], file_name, mnt_pt, fs_type);
+ }
+
+ return;
+}
+
+/*
+ * Local variables:
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */
</span></code></pre>
<br>
</li>
<li id='diff-12'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-12'>
<strong>
darshan-util/darshan-null-logutils.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- /dev/null
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-util/darshan-null-logutils.h
</span><span style="color: #aaaaaa">@@ -0,0 +1,21 @@
</span><span style="color: #000000;background-color: #ddffdd">+/*
+ * Copyright (C) 2015 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
+#ifndef __DARSHAN_NULL_LOG_UTILS_H
+#define __DARSHAN_NULL_LOG_UTILS_H
+
+#include "darshan-logutils.h"
+#include "darshan-null-log-format.h"
+
+/* declare NULL module counter name strings and logutil definition as
+ * extern variables so they can be used in other utilities
+ */
+extern char *null_counter_names[];
+extern char *null_f_counter_names[];
+
+extern struct darshan_mod_logutil_funcs null_logutils;
+
+#endif
</span></code></pre>
<br>
</li>
<li id='diff-13'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-13'>
<strong>
darshan-util/darshan-parser.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-util/darshan-parser.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-util/darshan-parser.c
</span><span style="color: #aaaaaa">@@ -321,6 +321,12 @@ int main(int argc, char **argv)
</span> printf("# mount entry:\t%s\t%s\n", mnt_pts[i], fs_types[i]);
}
<span style="color: #000000;background-color: #ddffdd">+ /* warn user if this log file is incomplete */
+ if(fd->partial_flag)
+ printf("\n# *WARNING*: This Darshan log contains incomplete data!\n"
+ "# This happens when an application creates\n"
+ "# more records than Darshan can track.\n");
+
</span> pdata.rank_cumul_io_time = malloc(sizeof(double)*job.nprocs);
pdata.rank_cumul_md_time = malloc(sizeof(double)*job.nprocs);
if (!pdata.rank_cumul_io_time || !pdata.rank_cumul_md_time)
</code></pre>
<br>
</li>
<li id='diff-14'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e#diff-14'>
<strong>
doc/darshan-modularization.txt
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/doc/darshan-modularization.txt
</span><span style="color: #000000;background-color: #ddffdd">+++ b/doc/darshan-modularization.txt
</span><span style="color: #aaaaaa">@@ -18,17 +18,17 @@ or what types of modules are used.
</span>
== Checking out and building the modularization branch
-Developers can clone the Darshan source repository using the following methods:
<span style="color: #000000;background-color: #ddffdd">+The Darshan source code is available at the following GitLab project page:
+https://xgitlab.cels.anl.gov/darshan/darshan. It is worth noting that this page
+also provides issue tracking to provide users the ability to browse known issues
+with the code or to report new issues.
</span>
-* "git clone git://git.mcs.anl.gov/radix/darshan" (read-only access)
-
-* "git clone \git@git.mcs.anl.gov:radix/darshan" (authenticated access)
-
-After cloning the Darshan source, it is necessary to checkout the modularization
-development branch:
<span style="color: #000000;background-color: #ddffdd">+The following commands can be used to clone the Darshan source code and checkout
+the modularization branch:
</span>
----
-git clone git@git.mcs.anl.gov:radix/darshan
<span style="color: #000000;background-color: #ddffdd">+git clone git@xgitlab.cels.anl.gov:darshan/darshan.git
+cd darshan
</span> git checkout dev-modular
----
<span style="color: #aaaaaa">@@ -43,14 +43,17 @@ Darshan.
</span>
The Darshan source tree is organized into two primary components:
-* *darshan-runtime*: Darshan runtime environment necessary for instrumenting MPI
<span style="color: #000000;background-color: #ddffdd">+* *darshan-runtime*: Darshan runtime framework necessary for instrumenting MPI
</span> applications and generating I/O characterization logs.
* *darshan-util*: Darshan utilities for analyzing the contents of a given Darshan
I/O characterization log.
-The following subsections provide an overview of each of these components with specific
-attention to how new instrumentation modules may be integrated into Darshan.
<span style="color: #000000;background-color: #ddffdd">+The following subsections provide detailed overviews of each of these components to
+give a better understanding of the architecture of the modularized version of Darshan.
+In link:darshan-modularization.html#_adding_new_instrumentation_modules[Section 4], we
+actually outline the necessary steps for integrating new instrumentation modules into
+Darshan.
</span>
=== Darshan-runtime
<span style="color: #aaaaaa">@@ -97,22 +100,41 @@ with Darshan at any given time and Darshan is capable of correlating records bet
</span> modules.
In the next three subsections, we describe instrumentation modules, the `darshan-core` component,
-and the `darshan-common` component in more detail. In
-link:darshan-modularization.html#_adding_new_instrumentation_modules[Section 4], we provide the
-required steps for integrating new instrumentation modules into Darshan. This section also includes
-details on an example module that can serve as a minimal starting point for new module implementations.
-In link:darshan-modularization.html#_shared_record_reductions[Section 5], we provide details on
-implementing a shared record reduction operation within an instrumentation module. This optional
-mechanism allows modules to compress records which are shared across all processes of an application,
-minimizing the size of the resulting I/O characterization log.
<span style="color: #000000;background-color: #ddffdd">+and the `darshan-common` component in more detail.
</span>
==== Instrumentation modules
-The wrapper functions used to intercept I/O function calls of interest are central to the design of
-any Darshan instrumentation module. These wrappers are used to extract pertinent I/O data from
-the function call and persist this data in some state structure maintained by the module. Modules
-must bootstrap themselves by initializing internal data structures within wrapper functions. The
-wrappers are inserted at compile time for statically linked executables (e.g., using the linkers
<span style="color: #000000;background-color: #ddffdd">+The new modularized version of Darshan allows for the generation of I/O characterizations
+composed from numerous instrumentation modules, where an instrumentation module is simply a
+Darshan component responsible for capturing I/O data from some arbitrary source. For example,
+distinct instrumentation modules may be defined for different I/O interfaces or to gather
+system-specific I/O parameters from a given computing system. Each instrumentation module
+interfaces with the `darshan-core` component to coordinate its initialization and shutdown
+and to provide output I/O characterization data to be written to log.
+
+In general, there are two different methods an instrumentation module can use to initialize
+itself: static initialization at Darshan startup time or dynamic initialization within
+intercepted function calls during application execution. The initialization process should
+initialize module-specific data structures and register the module with the `darshan-core`
+component so it is included in the output I/O characterization.
+
+The static initialization approach is useful for modules that do not have function calls
+that can be intercepted and instead can just grab all I/O characterization data at Darshan
+startup or shutdown time. A module can be statically initialized at Darshan startup time
+by adding it to the `mod_static_init_fns` list at the top of the `lib/darshan-core.c`
+source file.
+
+*NOTE*: Modules which require static initialization should typically provide a corresponding
+configure option to prevent the module from being built and capturing I/O data. The ability
+to disable a module using a configure option is especially necessary for system-specific
+modules which can not be built or used on other systems.
+
+Most instrumentation modules can just bootstrap themselves within wrapper functions during
+normal application execution. Each of Darshan's current I/O library instrumentation modules
+(POSIX, MPI-IO, HDF5, PnetCDF) follow this approach. Each wrapper function should just include
+logic to initialize data structures and register with `darshan-core` if this initialization
+has not already occurred. Darshan intercepts function calls of interest by inserting these
+wrappers at compile time for statically linked executables (e.g., using the linkers
</span> `--wrap` mechanism) and at runtime for dynamically linked executables (using LD_PRELOAD).
*NOTE*: Modules should not perform any I/O or communication within wrapper functions. Darshan records
<span style="color: #aaaaaa">@@ -130,85 +152,79 @@ struct darshan_module_funcs
</span> {
void (*begin_shutdown)(void);
void (*get_output_data)(
<span style="color: #000000;background-color: #ffdddd">- void** buf,
- int* size
- );
- void (*shutdown)(void);
- /* OPTIONAL: shared record reductions ignored by setting setup_reduction to NULL */
- void (*setup_reduction)(
</span><span style="color: #000000;background-color: #ddffdd">+ MPI_Comm mod_comm,
</span> darshan_record_id *shared_recs,
<span style="color: #000000;background-color: #ffdddd">- int *shared_rec_count,
- void **send_buf,
- void **recv_buf,
- int *rec_size
- );
- /* OPTIONAL: shared record reductions ignored by setting record_reduction_op to NULL */
- void (*record_reduction_op)(
- void* a,
- void* b,
- int *len,
- MPI_Datatype *datatype
</span><span style="color: #000000;background-color: #ddffdd">+ int shared_rec_count,
+ void** mod_buf,
+ int* mod_buf_sz
</span> );
<span style="color: #000000;background-color: #ddffdd">+ void (*shutdown)(void);
</span> };
`begin_shutdown()`
This function informs the module that Darshan is about to begin shutting down. It should disable
all wrappers to prevent the module from making future updates to internal data structures, primarily
-to ensure data consistency and avoid other race conditions. This function also serves as a final
-opportunity for a module to modify internal data structures prior to a possible reduction of shared
-data.
<span style="color: #000000;background-color: #ddffdd">+to ensure data consistency and avoid other race conditions.
</span>
`get_output_data()`
-This function is responsible for passing back a single buffer storing all data this module is
-contributing to the output I/O characterization.
<span style="color: #000000;background-color: #ddffdd">+This function is responsible for packing all module I/O data into a single buffer to be written
+to the output I/O characterization. This function can be used to run collective MPI operations on
+module data; for instance, Darshan typically tries to reduce file records which are shared across
+all application processes into a single data record (more details on the shared file reduction
+mechanism are given in link:darshan-modularization.html#_shared_record_reductions[Section 5]).
+
+* _mod_comm_ is the MPI communicator to use for collective communication
+
+* _shared_recs_ is a list of Darshan record identifiers that are shared across all application
+processes
</span>
-* _buf_ is a pointer to the address of the buffer this module is contributing to the I/O
-characterization.
<span style="color: #000000;background-color: #ddffdd">+* _shared_rec_count_ is the size of the shared record list
</span>
-* _size_ is the size of this module's output buffer.
<span style="color: #000000;background-color: #ddffdd">+* _mod_buf_ is a pointer to the buffer of this module's I/O characterization data
+
+* _mod_buf_sz_ is the size of the module's output buffer
</span>
`shutdown()`
This function is a signal from Darshan that it is safe to shutdown. It should clean up and free
all internal data structures.
-`setup_reduction()` and `record_reduction_op()` are optional function pointers which can be
-implemented to utilize Darshan's shared I/O record reduction mechanism, described in detail in
-link:darshan-modularization.html#_shared_record_reductions[Section 5]. Module developers can
-bypass this mechanism by setting these function pointers to NULL.
-
==== darshan-core
Within darshan-runtime, the darshan-core component manages the initialization and shutdown of the
-Darshan environment, provides instrumentation module developers an interface for registering modules
-with Darshan, and manages the compressing and the writing of the resultant I/O characterization.
-As illustrated in Figure 1, the darshan-core runtime environment intercepts `MPI_Init` and
-`MPI_Finalize` routines to initialze and shutdown the darshan runtime environment, respectively.
<span style="color: #000000;background-color: #ddffdd">+Darshan environment, provides an interface for modules to register themselves and their data
+records with Darshan, and manages the compressing and the writing of the resultant I/O
+characterization. As illustrated in Figure 1, the darshan-core runtime environment intercepts
+`MPI_Init` and `MPI_Finalize` routines to initialize and shutdown the darshan runtime environment,
+respectively.
</span>
-Each of the functions provided by darshan-core to interface with instrumentation modules are
<span style="color: #000000;background-color: #ddffdd">+Each of the functions provided by `darshan-core` to interface with instrumentation modules are
</span> described in detail below.
[source,c]
void darshan_core_register_module(
darshan_module_id mod_id,
struct darshan_module_funcs *funcs,
<span style="color: #000000;background-color: #ddffdd">+ int *my_rank,
</span> int *mod_mem_limit,
int *sys_mem_alignment);
The `darshan_core_register_module` function registers Darshan instrumentation modules with the
-darshan-core runtime environment. This function needs to be called at least once for any module
<span style="color: #000000;background-color: #ddffdd">+`darshan-core` runtime environment. This function needs to be called at least once for any module
</span> that will contribute data to Darshan's final I/O characterization.
* _mod_id_ is a unique identifier for the given module, which is defined in the Darshan log
-format header file (darshan-log-format.h).
<span style="color: #000000;background-color: #ddffdd">+format header file (`darshan-log-format.h`).
+
+* _funcs_ is the structure of function pointers (as described above in the previous section) that
+a module developer must provide to interface with the darshan-core runtime.
</span>
-* _funcs_ is the structure of function pointers (as described above) that a module developer must
-provide to interface with the darshan-core runtime.
<span style="color: #000000;background-color: #ddffdd">+* _my_rank_ is a pointer to an integer to store the calling process's application MPI rank in
</span>
* _mod_mem_limit_ is a pointer to an integer which will store the amount of memory Darshan
-allows this module to use at runtime. Currently, darshan-core will hardcode this value to 2 MiB,
<span style="color: #000000;background-color: #ddffdd">+allows this module to use at runtime. Currently, `darshan-core` will hardcode this value to 2 MiB,
</span> but in the future this may be changed to optimize Darshan's memory footprint. Note that Darshan
does not allocate any memory for modules, it just informs a module how much memory it can use.
<span style="color: #aaaaaa">@@ -221,7 +237,7 @@ void darshan_core_unregister_module(
</span> darshan_module_id mod_id);
The `darshan_core_unregister_module` function disassociates the given module from the
-darshan-core runtime. Consequentially, Darshan does not interface with the given module at
<span style="color: #000000;background-color: #ddffdd">+`darshan-core` runtime. Consequentially, Darshan does not interface with the given module at
</span> shutdown time and will not log any I/O data from the module. This function should only be used
if a module registers itself with darshan-core but later decides it does not want to contribute
any I/O data.
<span style="color: #aaaaaa">@@ -287,7 +303,7 @@ I/O calls or to store timestamps of when functions of interest were called.
</span>
==== darshan-common
-darshan-common is a utility component of darshan-runtime, providing module developers with
<span style="color: #000000;background-color: #ddffdd">+`darshan-common` is a utility component of darshan-runtime, providing module developers with
</span> general functions that are likely to be reused across multiple modules. These functions are
distinct from darshan-core functions since they do not require access to internal Darshan
state.
<span style="color: #aaaaaa">@@ -302,6 +318,9 @@ The address of the new string is returned and should be freed by the user.
</span>
* _path_ is the input path string to be cleaned up.
<span style="color: #000000;background-color: #ddffdd">+`darshan-common` also currently includes functions for maintaining counters that store
+common I/O values (such as common I/O access sizes or strides used by an application),
+as well as functions for calculating the variance of a given counter across all processes.
</span> As more modules are contributed, it is likely that more functionality can be refactored out
of module implementations and maintained in darshan-common, facilitating code reuse and
simplifying maintenance.
<span style="color: #aaaaaa">@@ -322,61 +341,71 @@ formatting information.
</span>
==== darshan-logutils
-Here we define each function of the `darshan-logutils` interface, which can be used to implement
-new log analysis utilities and to define module-specific functionality.
<span style="color: #000000;background-color: #ddffdd">+Here we define each function in the `darshan-logutils` interface, which can be used to create
+new log utilities and to implement module-specific interfaces into log files.
</span>
[source,c]
-darshan_fd darshan_log_open(const char *name, const char* mode);
<span style="color: #000000;background-color: #ddffdd">+darshan_fd darshan_log_open(const char *name);
</span>
-Opens Darshan log file stored at path `name`. `mode` can only be `r` for reading or `w` for
-writing. Returns a Darshan file descriptor on success, or `NULL` on error.
<span style="color: #000000;background-color: #ddffdd">+Opens Darshan log file stored at path `name`. The log file must already exist and is opened
+for reading only. As part of the open routine, the log file header is read to set internal
+file descriptor data structures. Returns a Darshan file descriptor on success or `NULL` on error.
</span>
[source,c]
-int darshan_log_getheader(darshan_fd fd, struct darshan_header *header);
<span style="color: #000000;background-color: #ddffdd">+darshan_fd darshan_log_create(const char *name, enum darshan_comp_type comp_type, int partial_flag);
</span>
-Fills in `header` structure from the log file referenced by descriptor `fd`. The `darshan_header`
-structure is defined in `darshan-log-format.h`. Returns `0` on success, `-1` on failure.
<span style="color: #000000;background-color: #ddffdd">+Creates a new darshan log file for writing only at path `name`. `comp_type` denotes the underlying
+compression type used on the log file (currently either libz or bzip2) and `partial_flag`
+denotes whether the log is storing partial data (that is, all possible application file records
+were not tracked by darshan). Returns a Darshan file descriptor on success or `NULL` on error.
</span>
[source,c]
int darshan_log_getjob(darshan_fd fd, struct darshan_job *job);
<span style="color: #000000;background-color: #ddffdd">+int darshan_log_putjob(darshan_fd fd, struct darshan_job *job);
</span>
-Fills in `job` structure from the log file referenced by descriptor `fd`. The `darshan_job`
<span style="color: #000000;background-color: #ddffdd">+Reads/writes `job` structure from/to the log file referenced by descriptor `fd`. The `darshan_job`
</span> structure is defined in `darshan-log-format.h`. Returns `0` on success, `-1` on failure.
[source,c]
int darshan_log_getexe(darshan_fd fd, char *buf);
<span style="color: #000000;background-color: #ddffdd">+int darshan_log_putexe(darshan_fd fd, char *buf);
</span>
-Fills in `buf` with the corresponding executable string (exe name and command line arguments)
-for the Darshan log referenced by `fd`. Returns `0` on success, `-1` on failure.
<span style="color: #000000;background-color: #ddffdd">+Reads/writes the corresponding executable string (exe name and command line arguments)
+from/to the Darshan log referenced by `fd`. Returns `0` on success, `-1` on failure.
</span>
[source,c]
int darshan_log_getmounts(darshan_fd fd, char*** mnt_pts, char*** fs_types, int* count);
<span style="color: #000000;background-color: #ddffdd">+int darshan_log_putmounts(darshan_fd fd, char** mnt_pts, char** fs_types, int count);
</span>
-Returns mounted file system information for the Darshan log referenced by `fd`. `mnt_pnts` points
<span style="color: #000000;background-color: #ddffdd">+Reads/writes mounted file system information for the Darshan log referenced by `fd`. `mnt_pnts` points
</span> to an array of strings storing mount points, `fs_types` points to an array of strings storing file
system types (e.g., ext4, nfs, etc.), and `count` points to an integer storing the total number
of mounted file systems recorded by Darshan. Returns `0` on success, `-1` on failure.
[source,c]
int darshan_log_gethash(darshan_fd fd, struct darshan_record_ref **hash);
<span style="color: #000000;background-color: #ddffdd">+int darshan_log_puthash(darshan_fd fd, struct darshan_record_ref *hash);
</span>
-Builds hash table of Darshan record identifiers to full names for all records contained
-in the Darshan log referenced by `fd`. `hash` is a pointer to the hash table (of type
-struct darshan_record_ref *, which should be initialized to `NULL`). This hash table is
-defined by the `uthash` hash table implementation and includes corresponding macros for
<span style="color: #000000;background-color: #ddffdd">+Reads/writes the hash table of Darshan record identifiers to full names for all records
+contained in the Darshan log referenced by `fd`. `hash` is a pointer to the hash table (of type
+struct darshan_record_ref *, which should be initialized to `NULL` for reading). This hash table
+is defined by the `uthash` hash table implementation and includes corresponding macros for
</span> searching, iterating, and deleting records from the hash. For detailed documentation on using this
hash table, consult `uthash` documentation in `darshan-util/uthash-1.9.2/doc/txt/userguide.txt`.
The `darshan-posix-parser` utility (for parsing POSIX module information out of a Darshan log)
provides an example of how this hash table may be used. Returns `0` on success, `-1` on failure.
[source,c]
-int darshan_log_get_moddat(darshan_fd fd, darshan_module_id mod_id, void *moddat_buf, int moddat_buf_sz);
<span style="color: #000000;background-color: #ddffdd">+int darshan_log_getmod(darshan_fd fd, darshan_module_id mod_id, void *mod_buf, int mod_buf_sz);
+int darshan_log_putmod(darshan_fd fd, darshan_module_id mod_id, void *mod_buf, int mod_buf_sz);
</span>
-Retrieves a chunk of (uncompressed) data for the module identified by `mod_id` from the Darshan log
-referenced by `fd`. `moddat_buf_sz` specifies the number of uncompressed bytes to read from the file
-and store in `moddat_buf`. This function may be repeatedly called to retrieve sequential chunks of data
-from a given Darshan file descriptor. This function returns `1` if `moddat_buf_sz` bytes were read
-successfully, `0` if no more data is available for this module, and `-1` otherwise.
<span style="color: #000000;background-color: #ddffdd">+Reads/writes a chunk of (uncompressed) module data for the module identified by `mod_id` from/to
+the Darshan log referenced by `fd`. `mod_buf_sz` specifies the number of uncompressed bytes to
+read/write from/to the file and store in `mod_buf`. The `darshan_log_getmod` routine can be
+repeatedly called to retrieve chunks of uncompressed data from a specific module region of the
+log file given by `fd`. The `darshan_log_putmod` routine just continually appends data to a
+specific module region in the log file given by `fd`. This function returns the number of bytes
+read/written on success, `-1` on failure.
</span>
*NOTE*: Darshan use a reader makes right conversion strategy to rectify endianness issues
between the machine a log was generated on and a machine analyzing the log. Accordingly,
<span style="color: #aaaaaa">@@ -387,32 +416,42 @@ macros (DARSHAN_BSWAP32/DARSHAN_BSWAP64) are provided in `darshan-logutils.h`.
</span> [source,c]
void darshan_log_close(darshan_fd fd);
-Close Darshan file descriptor `fd`. Returns `0` on success, `-1` on failure.
<span style="color: #000000;background-color: #ddffdd">+Close Darshan file descriptor `fd`. This routine *must* be called for newly created log files,
+as it flushes pending writes and writes a corresponding log file header before closing.
+
+*NOTE*: For newly created Darshan log files, care must be taken to write log file data in the
+correct order, since the log file write routines basically are appending data to the log file.
+The correct order for writing all log file data to file is: (1) job data, (2) exe string, (3)
+mount data, (4) record id -> file name map, (5) each module's data, in increasing order of
+module identifiers.
</span>
== Adding new instrumentation modules
-In this section we outline each step necessary to adding a module to Darshan. To assist module
-developers, we have provided the example "NULL" module (`darshan-runtime/lib/darshan-null.c`)
-as part of the darshan-runtime source. This example can be used as a minimal stubbed out module
-implementation. It is also heavily annotated to document more specific functionality provided
-by Darshan to module developers. For a full-fledged implementation of a module, developers
-can examine the POSIX module (`darshan-runtime/lib/darshan-posix.c`), which wraps and instruments
-a number of POSIX I/O functions.
<span style="color: #000000;background-color: #ddffdd">+In this section we outline each step necessary for adding a module to Darshan. To assist module
+developers, we have provided the example "NULL" module as part of the Darshan source tree
+(`darshan-null-log-format.h`, `darshan-runtime/lib/darshan-null.c`, and
+`darshan-util/darshan-null-logutils.*`) This example can be used as a minimal stubbed out module
+implementation that is heavily annotated to further clarify how modules interact with Darshan
+and to provide best practices to future module developers. For full-fledged module implementation
+examples, developers are encouraged to examine the POSIX and MPI-IO modules.
</span>
=== Log format headers
The following modifications to Darshan log format headers are required for defining
the module's record structure:
-* Add module identifier to darshan_module_id enum and add module string name to the
-darshan_module_name array in `darshan-log-format.h`.
<span style="color: #000000;background-color: #ddffdd">+* Add a module identifier to the `DARSHAN_MODULE_IDS` macro at the top of the `darshan-log-format.h`
+header. In this macro, the first field is a corresponding enum value that can be used to
+identify the module, the second field is a string name for the module, and the third field
+is a corresponding pointer to a Darshan log utility implementation for this module (which
+can be set to `NULL` until the module has its own log utility implementation).
</span>
* Add a top-level header that defines an I/O data record structure for the module. Consider
the "NULL" module and POSIX module log format headers for examples (`darshan-null-log-format.h`
and `darshan-posix-log-format.h`, respectively).
These log format headers are defined at the top level of the Darshan source tree, since both the
-darshan-runtime and darshan-util repositories depend on them.
<span style="color: #000000;background-color: #ddffdd">+darshan-runtime and darshan-util repositories depend on their definitions.
</span>
=== Darshan-runtime
<span style="color: #aaaaaa">@@ -421,7 +460,7 @@ darshan-runtime and darshan-util repositories depend on them.
</span> The following modifications to the darshan-runtime build system are necessary to integrate
new instrumentation modules:
-* Necessary linker flags for wrapping this module's functions need to be added to a
<span style="color: #000000;background-color: #ddffdd">+* Necessary linker flags for inserting this module's wrapper functions need to be added to a
</span> module-specific file which is used when linking applications with Darshan. For an example,
consider `darshan-runtime/darshan-posix-ld-opts`, the required linker options for the POSIX
module. The base linker options file for Darshan (`darshan-runtime/darshan-base-ld-opts.in`)
<span style="color: #aaaaaa">@@ -431,7 +470,7 @@ must also be updated to point to the new module-specific linker options file.
</span> source files, which will be stored in the `darshan-runtime/lib/` directory. The prerequisites
to building static and dynamic versions of `libdarshan` must be updated to include these objects,
as well.
<span style="color: #000000;background-color: #ffdddd">- - If the module defines a linker options file, a target must also be added to install this
</span><span style="color: #000000;background-color: #ddffdd">+ - If the module defines a linker options file, a rule must also be added to install this
</span> file with libdarshan.
==== Instrumentation module implementation
<span style="color: #aaaaaa">@@ -441,11 +480,6 @@ provide the following notes to assist module developers:
</span>
* Modules only need to include the `darshan.h` header to interface with darshan-core.
-* Lacking a way to bootstrap themselves, modules will have to include some logic in their
-wrappers to initialize necessary module state if initialization has not already occurred.
<span style="color: #000000;background-color: #ffdddd">- - Part of this initialization process should be registering the module with darshan-core,
- since this informs the module how much memory it may allocate.
</span>-
* The file record identifier given when registering a record with darshan-core can be used
to store the record structure in a hash table or some other structure.
- The `darshan_core_register_record` function is really more like a lookup function. It
<span style="color: #aaaaaa">@@ -462,19 +496,22 @@ to store the record structure in a hash table or some other structure.
</span> The following modifications to the darshan-util build system are necessary to integrate new
instrumentation modules:
-* Update `Makefile.in` with new targets necessary for building new utilities and module-specific
-log parsing source.
<span style="color: #000000;background-color: #ffdddd">- - Make sure to update `all`, `clean`, and `install` targets to reference updates.
- - If adding new log parsing functionality, make sure to add it as a prerequisite source for
- building libdarshan-util.
</span><span style="color: #000000;background-color: #ddffdd">+* Update `Makefile.in` with new targets necessary for building module-specific logutil source.
+ - Make sure to add the module's logutil implementation objects as a prerequisite for
+building `libdarshan-util`.
+ - Make sure to update `all`, `clean`, and `install` rules to reference updates.
</span>
==== Module-specific logutils and utilities
-For a straightforward reference implementation of module-specific log parsing functionality for
-the POSIX module, consider files `darshan-posix-logutils.c` and `darshan-posix-logutils.h`.
<span style="color: #000000;background-color: #ddffdd">+For a straightforward reference implementation of module-specific log utility functions,
+consider the implementations for the NULL module (`darshan-util/darshan-null-logutils.*`)
+and the POSIX module (`darshan-util/darshan-posix-logutils.*`). These module-specific log
+utility implementations are built on top of the `darshan_log_getmod()` and `darshan_log_putmod()`
+functions, and are used to read/write complete module records from/to file.
</span>
-Also, the `darshan-posix-parser` source provides a simple example of a utility which can leverage
-libdarshan-util for analyzing the contents of a given Darshan I/O characterization log.
<span style="color: #000000;background-color: #ddffdd">+Also, consider the `darshan-parser` source code for an example of a utility which can leverage
+`libdarshan-util` for analyzing the contents of a Darshan I/O characterization log with data
+from arbitrary instrumentation modules.
</span>
== Shared record reductions
<span style="color: #aaaaaa">@@ -482,68 +519,29 @@ Since Darshan perfers to aggregate data records which are shared across all proc
</span> data record, module developers should consider implementing this functionality eventually, though it
is not strictly required.
-As mentioned previously, module developers must provide implementations for the `setup_reduction()`
-and `record_reduction_op()` functions in the darshan_module_funcs structure to leverage Darshan's
-shared record reduction mechanism. These functions are described in detail as follows:
<span style="color: #000000;background-color: #ddffdd">+Module developers should implement the shared record reduction mechanism within the module's
+`get_output_data()` function, as it provides an MPI communicator for the module to use for
+collective communication and a list of record identifiers which are shared globally by the
+module (as described in link:darshan-modularization.html#_darshan_runtime[Section 3.1]).
</span>
-[source,c]
-void (*setup_reduction)(
<span style="color: #000000;background-color: #ffdddd">- darshan_record_id *shared_recs,
- int *shared_rec_count,
- void **send_buf,
- void **recv_buf,
- int *rec_size
</span>-);
-
-This function is used to prepare a module for performing a reduction operation. In general, this
-just involves providing the input buffers to the reduction, and (on rank 0 only) providing output
-buffer space to store the result of the reduction.
-
-* _shared_recs_ is a set of Darshan record identifiers which are associated with this module.
-These are the records which need to be reduced into single shared data records.
-
-* _shared_rec_count_ is a pointer to an integer storing the number of shared records will
-be reduced by this module. When the function is called this variable points to the number
-of shared records detected by Darshan, but the module can decide not to reduce any number
-of these records. Upon completion of the function, this variable should point to the number
-of shared records to perform reductions on (i.e., the size of the input and output buffers).
-
-* _send_buf_ is a pointer to the address of the send buffer used for performing the reduction
-operation. Upon completion, this variable should point to a buffer containing *_shared_rec_count_
-records that will be reduced.
-
-* _recv_buf_ is a pointer to the address of the receive bufffer used for performing the reduction
-operation. Upon completion, this variable should point to a buffer containing *_shared_rec_count_
-records that will be reduced. This variable is only valid on the root process (rank 0). This
-buffer address needs to be stored with module state, as it will be needed when retrieiving
-the final output buffers from this module.
-
-* _rec_size_ is just the size of the record structure being reduced for this module.
<span style="color: #000000;background-color: #ddffdd">+In general, implementing a shared record reduction involves the following steps:
</span>
-[source,c]
-void (*record_reduction_op)(
<span style="color: #000000;background-color: #ffdddd">- void* a,
- void* b,
- int *len,
- MPI_Datatype *datatype
</span>-);
<span style="color: #000000;background-color: #ddffdd">+* reorganizing shared records into a contiguous region in the buffer of module records
+
+* allocating a record buffer to store the reduction output on application rank 0
</span>
-This is the function which performs the actual shared record reduction operation. The prototype
-of this function matches that of the user function provided to the MPI_Op_create function. Refer
-to the http://www.mpich.org/static/docs/v3.1/www3/MPI_Op_create.html[documentation] for further
-details.
<span style="color: #000000;background-color: #ddffdd">+* creating an MPI reduction operation using the `MPI_Op_create()` function (see more
+http://www.mpich.org/static/docs/v3.1/www3/MPI_Op_create.html[here])
</span>
-Note that a module will likely need to clean up it's internal state after a reduction to get
-all data records into a contiguous buffer, as Darshan requires. This can be done within the
-`get_output_buffer()` function.
<span style="color: #000000;background-color: #ddffdd">+* reducing all shared records using the created MPI reduction operation and the send
+and receive buffers described above
</span>
-Module developers can examine the POSIX module for a comprehensive (and monolithic) implementation
-of the shared record reduction functionality.
<span style="color: #000000;background-color: #ddffdd">+For a more in-depth example of how to use the shared record reduction mechanism, consider
+the implementations of this in the POSIX or MPI-IO modules.
</span>
== Other resources
-* http://www.mcs.anl.gov/research/projects/darshan/[Darshan website]
<span style="color: #000000;background-color: #ddffdd">+* https://xgitlab.cels.anl.gov/darshan/darshan[Darshan GitLab page]
+* http://www.mcs.anl.gov/research/projects/darshan/[Darshan project website]
</span> * http://www.mcs.anl.gov/research/projects/darshan/docs/darshan-runtime.html[darshan-runtime documentation]
* http://www.mcs.anl.gov/research/projects/darshan/docs/darshan-util.html[darshan-util documentation]
-* https://lists.mcs.anl.gov/mailman/listinfo/darshan-users[Darshan-users mailing list]
-* https://trac.mcs.anl.gov/projects/darshan/report[Darshan trac page]
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e">View it on GitLab</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":["merge_requests","issues","commit"],"url":"https://xgitlab.cels.anl.gov/darshan/darshan/compare/0459f8ffc08951d813fc320a581bdd5fe4b4da31...c53dd65a6b6b983c1d4cb65abb3d1fbc1001933e"}}</script>
</p>
</div>
</body>
</html>