<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/2e9124099ae0471b9953f3c1ab27e30591823c5b">2e912409</a></strong>
<div>
<span>by Shane Snyder</span>
<i>at 2016-01-27T16:15:30-06:00</i>
</div>
<pre class='commit-message'>add benchmarking hooks for generating logs</pre>
</li>
</ul>
<h4>7 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
darshan-runtime/configure
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
darshan-runtime/darshan-runtime-config.h.in
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
darshan-runtime/darshan.h
</a>
</li>
<li class='file-stats'>
<a href='#diff-3'>
darshan-runtime/lib/darshan-core.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-4'>
darshan-runtime/lib/darshan-mpiio.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-5'>
darshan-runtime/lib/darshan-posix.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-6'>
darshan-test/darshan-shutdown-bench.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/commit/2e9124099ae0471b9953f3c1ab27e30591823c5b#diff-0'>
<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.
<span style="color: #000000;background-color: #ffdddd">-# Generated by GNU Autoconf 2.63 for darshan-runtime 3.0.0-pre3.
</span><span style="color: #000000;background-color: #ddffdd">+# Generated by GNU Autoconf 2.69 for darshan-runtime 3.0.0-pre3.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
</span> #
<span style="color: #000000;background-color: #ffdddd">-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
</span> # 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: #ffdddd">-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
</span><span style="color: #000000;background-color: #ddffdd">+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
</span>
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
<span style="color: #000000;background-color: #ffdddd">-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
</span><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
<span style="color: #000000;background-color: #ffdddd">-
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
-
-# 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
-
</span> 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
<span style="color: #000000;background-color: #ffdddd">-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
</span><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
<span style="color: #000000;background-color: #ffdddd">-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
</span>
# 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.
<span style="color: #000000;background-color: #ffdddd">-case $0 in
</span><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
-done
</span><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
<span style="color: #000000;background-color: #ffdddd">-# 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><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
<span style="color: #000000;background-color: #ffdddd">-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-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" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
</span> # CDPATH.
<span style="color: #000000;background-color: #ffdddd">-$as_unset CDPATH
-
-
</span><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 ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- 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
<span style="color: #000000;background-color: #ffdddd">-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
</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 as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
</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>
<span style="color: #000000;background-color: #ffdddd">-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
</span> else
<span style="color: #000000;background-color: #ffdddd">- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- 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; }
-") 2> /dev/null; then
- :
-else
- 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
<span style="color: #000000;background-color: #ffdddd">- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
</span><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
- # 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
- 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
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-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
-else
- 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
<span style="color: #000000;background-color: #ffdddd">-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- 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
<span style="color: #000000;background-color: #ffdddd">-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- 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; }
-
-_ASEOF
-}; then
- break
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> 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
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- 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><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; }
-fi
</span><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>
<span style="color: #000000;background-color: #ffdddd">-fi
</span>
<span style="color: #000000;background-color: #ffdddd">-fi
</span><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>
<span style="color: #000000;background-color: #ffdddd">-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- 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>
<span style="color: #000000;background-color: #ffdddd">-exitcode=0
-if as_func_success; then
- :
</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.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
</span><span style="color: #000000;background-color: #ddffdd">+ as_expr=false
</span> fi
<span style="color: #000000;background-color: #ffdddd">-if as_func_ret_success; then
- :
</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.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
</span><span style="color: #000000;background-color: #ddffdd">+ as_basename=false
</span> fi
<span style="color: #000000;background-color: #ffdddd">-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
</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
<span style="color: #000000;background-color: #ffdddd">-test \$exitcode = 0") || {
- 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
}
<span style="color: #000000;background-color: #ffdddd">-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
</span> ECHO_C= ECHO_N= ECHO_T=
<span style="color: #000000;background-color: #ffdddd">-case `echo -n x` in
</span><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
<span style="color: #000000;background-color: #ffdddd">-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
</span>
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
<span style="color: #000000;background-color: #ffdddd">-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- 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
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
</span><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'"
<span style="color: #000000;background-color: #ffdddd">-
-exec 7<&0 </dev/null 6>&1
</span><span style="color: #000000;background-color: #ddffdd">+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
</span>
# Name of the host.
<span style="color: #000000;background-color: #ffdddd">-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
</span><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=
<span style="color: #000000;background-color: #ffdddd">-SHELL=${CONFIG_SHELL-/bin/sh}
</span>
# 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-pre3'
PACKAGE_STRING='darshan-runtime 3.0.0-pre3'
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">@@ -781,8 +766,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">@@ -827,8 +813,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">@@ -854,8 +839,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">@@ -1059,8 +1043,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">@@ -1076,8 +1059,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">@@ -1107,17 +1089,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
-Try \`$0 --help' for more information." >&2
- { (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">@@ -1126,7 +1108,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">@@ -1134,15 +1116,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">@@ -1165,8 +1145,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">@@ -1180,8 +1159,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">@@ -1196,11 +1173,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">@@ -1239,13 +1214,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=`(
<span style="color: #000000;background-color: #ffdddd">- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
- { (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">@@ -1285,7 +1258,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">@@ -1366,13 +1339,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">@@ -1415,42 +1389,380 @@ case $srcdir in
</span> ac_top_srcdir=$ac_top_build_prefix$srcdir
ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
<span style="color: #000000;background-color: #ffdddd">-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
</span><span style="color: #000000;background-color: #ddffdd">+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-pre3
+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
+
+# 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;;
+esac
+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>
<span style="color: #000000;background-color: #ffdddd">-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
- cat <<\_ACEOF
-darshan-runtime configure 3.0.0-pre3
-generated by GNU Autoconf 2.63
</span><span style="color: #000000;background-color: #ddffdd">+} # ac_fn_c_try_link
</span>
<span style="color: #000000;background-color: #ffdddd">-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><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
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span> fi
<span style="color: #000000;background-color: #ddffdd">+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-pre3, which was
<span style="color: #000000;background-color: #ffdddd">-generated by GNU Autoconf 2.63. Invocation command line was
</span><span style="color: #000000;background-color: #ddffdd">+generated by GNU Autoconf 2.69. Invocation command line was
</span>
$ $0 $@
<span style="color: #aaaaaa">@@ -1486,8 +1798,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"
-done
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "PATH: $as_dir"
+ done
</span> IFS=$as_save_IFS
} >&5
<span style="color: #aaaaaa">@@ -1524,9 +1836,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">@@ -1542,13 +1854,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
<span style="color: #000000;background-color: #ffdddd">-$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><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">@@ -1560,11 +1872,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. ##
<span style="color: #000000;background-color: #ffdddd">-## ---------------- ##
-_ASBOX
</span><span style="color: #000000;background-color: #ddffdd">+## ---------------- ##"
</span> echo
# The following way of writing the cache mishandles newlines in values,
(
<span style="color: #aaaaaa">@@ -1573,13 +1883,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">@@ -1598,11 +1908,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. ##
<span style="color: #000000;background-color: #ffdddd">-## ----------------- ##
-_ASBOX
</span><span style="color: #000000;background-color: #ddffdd">+## ----------------- ##"
</span> echo
for ac_var in $ac_subst_vars
do
<span style="color: #aaaaaa">@@ -1615,11 +1923,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. ##
<span style="color: #000000;background-color: #ffdddd">-## ------------------- ##
-_ASBOX
</span><span style="color: #000000;background-color: #ddffdd">+## ------------------- ##"
</span> echo
for ac_var in $ac_subst_files
do
<span style="color: #aaaaaa">@@ -1633,11 +1939,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. ##
<span style="color: #000000;background-color: #ffdddd">-## ----------- ##
-_ASBOX
</span><span style="color: #000000;background-color: #ddffdd">+## ----------- ##"
</span> echo
cat confdefs.h
echo
<span style="color: #aaaaaa">@@ -1651,46 +1955,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
<span style="color: #000000;background-color: #ffdddd">-
</span> cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-
</span> cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-
</span> cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-
</span> 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">@@ -1701,19 +2012,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">@@ -1721,7 +2036,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">@@ -1736,11 +2051,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">@@ -1750,17 +2065,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
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
</span><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
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
</span><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
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
</span><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;}
<span style="color: #000000;background-color: #ffdddd">- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
</span><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">@@ -1772,43 +2087,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
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (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: #ffdddd">-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
</span><span style="color: #000000;background-color: #ddffdd">+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
</span>
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
<span style="color: #aaaaaa">@@ -1835,9 +2127,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
-$as_echo "$as_me: error: cannot find install-sh or install.sh in ../maint/config \"$srcdir\"/../maint/config" >&2;}
- { (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">@@ -1866,10 +2156,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.
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
</span><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
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_path_install+set}" = set; then
</span><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">@@ -1877,11 +2167,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.
-case $as_dir/ in
- ./ | .// | /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">@@ -1889,7 +2179,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
<span style="color: #000000;background-color: #ffdddd">- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
</span><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">@@ -1918,7 +2208,7 @@ case $as_dir/ in
</span> ;;
esac
<span style="color: #000000;background-color: #ffdddd">-done
</span><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">@@ -1934,7 +2224,7 @@ fi
</span> INSTALL=$ac_install_sh
fi
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
</span><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">@@ -1946,7 +2236,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
</span> test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking whether the mpicc compiler works" >&5
</span><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">@@ -1956,9 +2246,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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_prog_CC+set}" = set; then
</span><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">@@ -1969,24 +2259,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
<span style="color: #000000;background-color: #ffdddd">-done
</span><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">@@ -1996,9 +2286,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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
</span><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">@@ -2009,24 +2299,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
<span style="color: #000000;background-color: #ffdddd">-done
</span><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">@@ -2035,7 +2325,7 @@ fi
</span> else
case $cross_compiling:$ac_tool_warned in
yes:)
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
</span><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">@@ -2049,9 +2339,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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_prog_CC+set}" = set; then
</span><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">@@ -2062,24 +2352,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
<span style="color: #000000;background-color: #ffdddd">-done
</span><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">@@ -2089,9 +2379,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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_prog_CC+set}" = set; then
</span><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">@@ -2103,18 +2393,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
<span style="color: #000000;background-color: #ffdddd">-done
</span><span style="color: #000000;background-color: #ddffdd">+ done
</span> IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
<span style="color: #aaaaaa">@@ -2133,10 +2423,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">@@ -2148,9 +2438,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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_prog_CC+set}" = set; then
</span><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">@@ -2161,24 +2451,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
<span style="color: #000000;background-color: #ffdddd">-done
</span><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">@@ -2192,9 +2482,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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
</span><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">@@ -2205,24 +2495,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
<span style="color: #000000;background-color: #ffdddd">-done
</span><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">@@ -2235,7 +2525,7 @@ done
</span> else
case $cross_compiling:$ac_tool_warned in
yes:)
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
</span><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">@@ -2246,57 +2536,37 @@ fi
</span> fi
<span style="color: #000000;background-color: #ffdddd">-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
</span><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;}
<span style="color: #000000;background-color: #ffdddd">-{ { $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;}
- { (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.
<span style="color: #000000;background-color: #ffdddd">-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
</span><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
<span style="color: #000000;background-color: #ffdddd">-{ (ac_try="$ac_compiler --version >&5"
-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
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-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
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
</span><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
<span style="color: #000000;background-color: #ffdddd">-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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>
<span style="color: #000000;background-color: #ffdddd">-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2312,8 +2582,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.
<span style="color: #000000;background-color: #ffdddd">-{ $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><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">@@ -2329,17 +2599,17 @@ do
</span> done
rm -f $ac_rmfiles
<span style="color: #000000;background-color: #ffdddd">-if { (ac_try="$ac_link_default"
</span><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
<span style="color: #000000;background-color: #ffdddd">-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&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
</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">@@ -2356,7 +2626,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">@@ -2375,84 +2645,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
</span> else
ac_file=''
fi
<span style="color: #000000;background-color: #ffdddd">-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
- $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
<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: 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;}
- { (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: #ffdddd">-
</span><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
<span style="color: #000000;background-color: #ffdddd">-# 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
- if { ac_try='./$ac_file'
- { (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
- (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
- cross_compiling=yes
- else
- { { $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;}
- { (exit 1); exit 1; }; }; }
- fi
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
</span> rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
<span style="color: #000000;background-color: #ffdddd">-# 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><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; }
<span style="color: #000000;background-color: #ffdddd">-if { (ac_try="$ac_link"
</span><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
<span style="color: #000000;background-color: #ffdddd">-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&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
</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">@@ -2467,32 +2694,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;}
<span style="color: #000000;background-color: #ffdddd">-{ { $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;}
- { (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
<span style="color: #000000;background-color: #ffdddd">-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
</span><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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_objext+set}" = set; then
</span><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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2504,17 +2782,17 @@ main ()
</span> }
_ACEOF
rm -f conftest.o conftest.obj
<span style="color: #000000;background-color: #ffdddd">-if { (ac_try="$ac_compile"
</span><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
<span style="color: #000000;background-color: #ffdddd">-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&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
</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">@@ -2527,31 +2805,23 @@ else
</span> $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
<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: 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;}
- { (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
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
</span><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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_c_compiler_gnu+set}" = set; then
</span><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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2565,37 +2835,16 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
</span><span style="color: #000000;background-color: #ddffdd">+ ac_compiler_gnu=no
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
</span><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">@@ -2604,59 +2853,31 @@ else
</span> fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_prog_cc_g+set}" = set; then
</span><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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
</span><span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
</span>
<span style="color: #000000;background-color: #ffdddd">- CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
</span><span style="color: #000000;background-color: #ddffdd">+ ;
+ return 0;
+}
</span> _ACEOF
<span style="color: #000000;background-color: #ffdddd">-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+else
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2667,36 +2888,12 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_compile "$LINENO"; then :
</span>
<span style="color: #000000;background-color: #ffdddd">- ac_c_werror_flag=$ac_save_c_werror_flag
</span><span style="color: #000000;background-color: #ddffdd">+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
</span> CFLAGS="-g"
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
int
<span style="color: #aaaaaa">@@ -2707,42 +2904,17 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
<span style="color: #000000;background-color: #ffdddd">-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
</span><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">@@ -2759,23 +2931,18 @@ else
</span> CFLAGS=
fi
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_prog_cc_c89+set}" = set; then
</span><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
<span style="color: #000000;background-color: #ffdddd">-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
<span style="color: #000000;background-color: #ffdddd">-#include <sys/types.h>
-#include <sys/stat.h>
</span><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">@@ -2827,32 +2994,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
-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
<span style="color: #000000;background-color: #ffdddd">-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
<span style="color: #aaaaaa">@@ -2863,17 +3007,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">@@ -2882,11 +3028,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
</span> ac_compiler_gnu=$ac_cv_c_compiler_gnu
<span style="color: #000000;background-color: #ffdddd">-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -2897,38 +3039,15 @@ int ret = MPI_Init(0, (void*)0)
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $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; }
<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
-$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;}
- { (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
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
<span style="color: #aaaaaa">@@ -2936,14 +3055,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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
</span><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">@@ -2958,11 +3077,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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -2971,78 +3086,34 @@ cat >>conftest.$ac_ext <<_ACEOF
</span> #endif
Syntax error
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
</span><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
<span style="color: #000000;background-color: #ffdddd">-
-rm -f conftest.err conftest.$ac_ext
</span><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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
</span> # Passes both tests.
ac_preproc_ok=:
break
fi
<span style="color: #000000;background-color: #ffdddd">-
-rm -f conftest.err conftest.$ac_ext
</span><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.
<span style="color: #000000;background-color: #ffdddd">-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
</span><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">@@ -3054,7 +3125,7 @@ fi
</span> else
ac_cv_prog_CPP=$CPP
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
</span><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">@@ -3065,11 +3136,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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -3078,87 +3145,40 @@ cat >>conftest.$ac_ext <<_ACEOF
</span> #endif
Syntax error
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
</span><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
<span style="color: #000000;background-color: #ffdddd">-
-rm -f conftest.err conftest.$ac_ext
</span><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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
</span> # Passes both tests.
ac_preproc_ok=:
break
fi
<span style="color: #000000;background-color: #ffdddd">-
-rm -f conftest.err conftest.$ac_ext
</span><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.
<span style="color: #000000;background-color: #ffdddd">-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
</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;}
<span style="color: #000000;background-color: #ffdddd">-{ { $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;}
- { (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">@@ -3168,9 +3188,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
</span> ac_compiler_gnu=$ac_cv_c_compiler_gnu
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_path_GREP+set}" = set; then
</span><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">@@ -3181,10 +3201,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">@@ -3201,7 +3221,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">@@ -3216,26 +3236,24 @@ esac
</span> $ac_path_GREP_found && break 3
done
done
<span style="color: #000000;background-color: #ffdddd">-done
</span><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
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
</span><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"
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_path_EGREP+set}" = set; then
</span><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">@@ -3249,10 +3267,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">@@ -3269,7 +3287,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">@@ -3284,12 +3302,10 @@ esac
</span> $ac_path_EGREP_found && break 3
done
done
<span style="color: #000000;background-color: #ffdddd">-done
</span><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
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (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">@@ -3297,21 +3313,17 @@ fi
</span>
fi
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
</span><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"
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_header_stdc+set}" = set; then
</span><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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -3326,48 +3338,23 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
</span><span style="color: #000000;background-color: #ddffdd">+ ac_cv_header_stdc=no
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> 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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -3377,18 +3364,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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -3398,14 +3381,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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -3432,301 +3411,81 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-rm -f conftest$ac_exeext
-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-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
</span><span style="color: #000000;background-color: #ddffdd">+if ac_fn_c_try_run "$LINENO"; then :
</span>
<span style="color: #000000;background-color: #ffdddd">-( exit $ac_status )
-ac_cv_header_stdc=no
</span><span style="color: #000000;background-color: #ddffdd">+else
+ ac_cv_header_stdc=no
</span> fi
<span style="color: #000000;background-color: #ffdddd">-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
</span><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
<span style="color: #000000;background-color: #ffdddd">-
</span> fi
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
</span><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
<span style="color: #000000;background-color: #ffdddd">-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
</span><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.
<span style="color: #000000;background-color: #ffdddd">-
-
-
-
-
-
-
-
-
</span> for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
<span style="color: #000000;background-color: #ffdddd">-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
- $as_echo_n "(cached) " >&6
-else
- 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
- *\"* | *\`* | *\\*) 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
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-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"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#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
- 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
-$as_echo "$as_me: WARNING: Sorry, $withval does not exist, checking usual places" >&2;}
- fi
-else
- { { $as_echo "$as_me:$LINENO: error: zlib is required" >&5
-$as_echo "$as_me: error: zlib is required" >&2;}
- { (exit 1); exit 1; }; }
-fi
-fi
-
-
-if test "${ac_cv_header_zlib_h+set}" = set; then
- { $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
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
-else
- # Is the header compilable?
-{ $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
- *\"* | *\`* | *\\*) 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
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-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><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
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
</span>
<span style="color: #000000;background-color: #ffdddd">- ac_header_preproc=no
</span> fi
<span style="color: #000000;background-color: #ffdddd">-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
</span><span style="color: #000000;background-color: #ddffdd">+done
</span>
<span style="color: #000000;background-color: #ffdddd">-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
</span>
<span style="color: #000000;background-color: #ffdddd">- ;;
-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
- $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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
-
</span> fi
<span style="color: #000000;background-color: #ffdddd">-if test "x$ac_cv_header_zlib_h" = x""yes; then
- :
</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
-$as_echo "$as_me: error: z.h not found" >&2;}
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "z.h not found" "$LINENO" 5
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
-{ $as_echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
</span><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"
<span style="color: #000000;background-color: #ffdddd">-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -3744,43 +3503,18 @@ return inflateEnd ();
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_z_inflateEnd=no
</span><span style="color: #000000;background-color: #ddffdd">+ ac_cv_lib_z_inflateEnd=no
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then
</span><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">@@ -3788,21 +3522,17 @@ _ACEOF
</span> LIBS="-lz $LIBS"
else
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: libz not found" >&5
-$as_echo "$as_me: error: libz not found" >&2;}
- { (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.
<span style="color: #000000;background-color: #ffdddd">-if test "${enable_cuserid+set}" = set; then
</span><span style="color: #000000;background-color: #ddffdd">+if test "${enable_cuserid+set}" = set; then :
</span> enableval=$enable_cuserid; if test "x$enableval" = "xno" ; then
<span style="color: #000000;background-color: #ffdddd">-cat >>confdefs.h <<\_ACEOF
-#define DARSHAN_DISABLE_CUSERID 1
-_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+$as_echo "#define DARSHAN_DISABLE_CUSERID 1" >>confdefs.h
</span>
fi
<span style="color: #aaaaaa">@@ -3810,7 +3540,7 @@ fi
</span>
# Check whether --enable-ld-preload was given.
<span style="color: #000000;background-color: #ffdddd">-if test "${enable_ld_preload+set}" = set; then
</span><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">@@ -3819,12 +3549,10 @@ fi
</span>
# Check whether --enable-group-readable-logs was given.
<span style="color: #000000;background-color: #ffdddd">-if test "${enable_group_readable_logs+set}" = set; then
</span><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
<span style="color: #000000;background-color: #ffdddd">-cat >>confdefs.h <<\_ACEOF
-#define __DARSHAN_GROUP_READABLE_LOGS 1
-_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+$as_echo "#define __DARSHAN_GROUP_READABLE_LOGS 1" >>confdefs.h
</span>
fi
<span style="color: #aaaaaa">@@ -3833,11 +3561,9 @@ fi
</span>
# Check whether --with-mem-align was given.
<span style="color: #000000;background-color: #ffdddd">-if test "${with_mem_align+set}" = set; then
</span><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
-$as_echo "$as_me: error: --with-mem-align must be given a number in bytes" >&2;}
- { (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">@@ -3852,11 +3578,9 @@ fi
</span>
# Check whether --with-log-path-by-env was given.
<span style="color: #000000;background-color: #ffdddd">-if test "${with_log_path_by_env+set}" = set; then
</span><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
-$as_echo "$as_me: error: --with-log-path-by-env must be given at least one variable name" >&2;}
- { (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">@@ -3872,11 +3596,9 @@ fi
</span>
# Check whether --with-log-hints was given.
<span style="color: #000000;background-color: #ffdddd">-if test "${with_log_hints+set}" = set; then
</span><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
-$as_echo "$as_me: error: --with-log-hints must be given an argument" >&2;}
- { (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">@@ -3892,11 +3614,9 @@ fi
</span>
# Check whether --with-log-path was given.
<span style="color: #000000;background-color: #ffdddd">-if test "${with_log_path+set}" = set; then
</span><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
-$as_echo "$as_me: error: --with-log-path must be given a pathname" >&2;}
- { (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">@@ -3912,11 +3632,9 @@ fi
</span>
# Check whether --with-jobid-env was given.
<span style="color: #000000;background-color: #ffdddd">-if test "${with_jobid_env+set}" = set; then
</span><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
-$as_echo "$as_me: error: --with-jobid-env must be given a name" >&2;}
- { (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">@@ -3931,19 +3649,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
-$as_echo "$as_me: error: must provide --with-mem-align=<num> argument to configure." >&2;}
- { (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
-$as_echo "$as_me: error: must provide --with-log-path=<path> _or_ --with-log-path-by-env=<variable list> argument to configure." >&2;}
- { (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
-$as_echo "$as_me: error: must provide --with-jobid-env=<name> argument to configure." >&2;}
- { (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">@@ -3956,146 +3668,12 @@ fi
</span>
# checks to see how we can print 64 bit values on this architecture
<span style="color: #000000;background-color: #ffdddd">-
-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
- { $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
- $as_echo_n "(cached) " >&6
-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
- # Is the header compilable?
-{ $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
- *\"* | *\`* | *\\*) 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
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-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
- *\"* | *\`* | *\\*) 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
- (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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-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
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-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
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-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"'`
- 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
<span style="color: #000000;background-color: #ffdddd">-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
</span><span style="color: #000000;background-color: #ddffdd">+#define HAVE_INTTYPES_H 1
</span> _ACEOF
fi
<span style="color: #aaaaaa">@@ -4103,17 +3681,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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
</span><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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4128,36 +3702,15 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_inttypes_pri_broken=yes
</span><span style="color: #000000;background-color: #ddffdd">+ gt_cv_inttypes_pri_broken=yes
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
</span><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">@@ -4173,175 +3726,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
-$as_echo "$as_me: error: PRI_xx macros are broken" >&2;}
- { (exit 1); exit 1; }; }
-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
- { $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
- $as_echo_n "(cached) " >&6
-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
- # Is the header compilable?
-{ $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
- *\"* | *\`* | *\\*) 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
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-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
- *\"* | *\`* | *\\*) 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
- (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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-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
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-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
- $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"
-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"'`
- 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
<span style="color: #000000;background-color: #ffdddd">-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
</span><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
-$as_echo "$as_me: error: Couldn't find inttypes.h" >&2;}
- { (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; }
<span style="color: #000000;background-color: #ffdddd">-if test "${ac_cv_c_bigendian+set}" = set; then
</span><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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4349,46 +3759,34 @@ cat >>conftest.$ac_ext <<_ACEOF
</span> typedef int dummy;
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
<span style="color: #000000;background-color: #ffdddd">- # 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
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
</span><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
<span style="color: #000000;background-color: #ffdddd">-
</span> 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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4406,30 +3804,9 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4445,49 +3822,18 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
</span><span style="color: #000000;background-color: #ddffdd">+ ac_cv_c_bigendian=no
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
<span style="color: #000000;background-color: #ffdddd">-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> 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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4496,36 +3842,15 @@ main ()
</span> {
#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
bogus endian macros
<span style="color: #000000;background-color: #ffdddd">- #endif
-
- ;
- return 0;
-}
-_ACEOF
-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- # It does; now see whether it defined to _BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
</span><span style="color: #000000;background-color: #ddffdd">+ #endif
+
+ ;
+ return 0;
+}
</span> _ACEOF
<span style="color: #000000;background-color: #ffdddd">-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4540,51 +3865,20 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
</span><span style="color: #000000;background-color: #ddffdd">+ ac_cv_c_bigendian=no
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
<span style="color: #000000;background-color: #ffdddd">-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> 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.
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4610,24 +3904,7 @@ return use_ascii (foo) == use_ebcdic (foo);
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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">@@ -4639,20 +3916,10 @@ $as_echo "$ac_try_echo") >&5
</span> ac_cv_c_bigendian=unknown
fi
fi
<span style="color: #000000;background-color: #ffdddd">-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
<span style="color: #000000;background-color: #ffdddd">- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4672,79 +3939,41 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-rm -f conftest$ac_exeext
-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
</span><span style="color: #000000;background-color: #ddffdd">+ ac_cv_c_bigendian=yes
</span> fi
<span style="color: #000000;background-color: #ffdddd">-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
</span><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
<span style="color: #000000;background-color: #ffdddd">-
</span> fi
fi
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
</span><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
-#define WORDS_BIGENDIAN 1
-_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
</span> ;; #(
no)
;; #(
universal)
<span style="color: #000000;background-color: #ffdddd">-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
</span><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
-$as_echo "$as_me: error: unknown endianness
- 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"
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for struct aiocb64" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4757,52 +3986,25 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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; }
<span style="color: #000000;background-color: #ffdddd">-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AIOCB64 1
-_ACEOF
</span><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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $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: #000000;background-color: #ffdddd">-
</span> 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"
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for off64_t" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -4829,182 +4031,25 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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; }
<span style="color: #000000;background-color: #ffdddd">-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OFF64_T 1
-_ACEOF
</span><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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $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: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$old_cflags"
<span style="color: #000000;background-color: #ffdddd">-
-
</span> for ac_header in mntent.h sys/mount.h
<span style="color: #000000;background-color: #ffdddd">-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
- { $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
- $as_echo_n "(cached) " >&6
-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
- # Is the header compilable?
-{ $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
- *\"* | *\`* | *\\*) 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
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-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
- *\"* | *\`* | *\\*) 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
- (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 && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-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
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-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
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-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"'`
- 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">@@ -5034,13 +4079,9 @@ prefix=$savePrefix
</span> exec_prefix=$saveExecprefix
# determine if the MPI library includes MPI-IO functions or not
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for MPI-IO support in MPI" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -5058,53 +4099,22 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; 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
-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;}
- { (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
<span style="color: #000000;background-color: #ffdddd">-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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.
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: checking for MPI-IO prototypes without const qualifier" >&5
</span><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; }
<span style="color: #000000;background-color: #ffdddd">-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -5120,42 +4130,18 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $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; }
# 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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><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">@@ -5171,250 +4157,95 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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; }
<span style="color: #000000;background-color: #ffdddd">-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MPIIO_CONST 1
-_ACEOF
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
</span><span style="color: #000000;background-color: #ddffdd">+$as_echo "#define HAVE_MPIIO_CONST 1" >>confdefs.h
</span>
fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# determine if mpicc can create shared libraries that use MPI functions
<span style="color: #000000;background-color: #ffdddd">-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 ()
-{
-
- int size;
- MPI_Comm_size(MPI_COMM_WORLD, &size);
-
- ;
- return 0;
-}
-_ACEOF
-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;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:$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"
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-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
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_MPIO_Request=no
-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))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+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>
<span style="color: #000000;background-color: #ffdddd">-
</span> int
main ()
{
<span style="color: #000000;background-color: #ffdddd">-if (sizeof ((MPIO_Request)))
- return 0;
</span><span style="color: #000000;background-color: #ddffdd">+
+ int size;
+ MPI_Comm_size(MPI_COMM_WORLD, &size);
+
</span> ;
return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-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><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
-sed 's/^/| /' conftest.$ac_ext >&5
-
</span><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>
<span style="color: #000000;background-color: #ffdddd">-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><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>
<span style="color: #000000;background-color: #ffdddd">-cat >>confdefs.h <<\_ACEOF
-#define __D_MPI_REQUEST MPIO_Request
-_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+$as_echo "#define __D_MPI_REQUEST MPIO_Request" >>confdefs.h
</span>
else
<span style="color: #000000;background-color: #ffdddd">-cat >>confdefs.h <<\_ACEOF
-#define __D_MPI_REQUEST MPI_Request
-_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+$as_echo "#define __D_MPI_REQUEST MPI_Request" >>confdefs.h
</span>
fi
# attempt to detect library naming convention in mpi compiler script
<span style="color: #000000;background-color: #ffdddd">-if $CC -show foo.c -o foo >& /dev/null; then
- { $as_echo "$as_me:$LINENO: checking for old (pre-3.1.1) style MPICH library naming convention" >&5
</span><span style="color: #000000;background-color: #ddffdd">+if $CC -show foo.c -o foo >& /dev/null; then :
+ { $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; }
<span style="color: #000000;background-color: #ffdddd">- if $CC -show foo.c -o foo |grep lmpich >& /dev/null; then
- { $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
<span style="color: #000000;background-color: #ffdddd">-
</span> else
MPICH_LIB_OLD=0
fi
<span style="color: #000000;background-color: #ffdddd">-
</span> # check to see whether the bgq instrumentation module should be built
# Check whether --enable-bgq_mod was given.
<span style="color: #000000;background-color: #ffdddd">-if test "${enable_bgq_mod+set}" = set; then
</span><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">@@ -5422,13 +4253,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
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
</span><span style="color: #000000;background-color: #ddffdd">+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span> /* end confdefs.h. */
#ifndef __bgq__
<span style="color: #aaaaaa">@@ -5443,51 +4270,25 @@ main ()
</span> return 0;
}
_ACEOF
<span style="color: #000000;background-color: #ffdddd">-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:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { $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; }
<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
-$as_echo "$as_me: error: BG/Q module enabled in non-BG/Q environment" >&2;}
- { (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
<span style="color: #000000;background-color: #ffdddd">-
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
</span> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
# Check whether --with-mod-mem was given.
<span style="color: #000000;background-color: #ffdddd">-if test "${with_mod_mem+set}" = set; then
</span><span style="color: #000000;background-color: #ddffdd">+if test "${with_mod_mem+set}" = set; then :
</span> withval=$with_mod_mem; if test x$withval = xyes; then
<span style="color: #000000;background-color: #ffdddd">- { { $as_echo "$as_me:$LINENO: error: --with-mod-mem must be given a number" >&5
-$as_echo "$as_me: error: --with-mod-mem must be given a number" >&2;}
- { (exit 1); exit 1; }; }
</span><span style="color: #000000;background-color: #ddffdd">+ as_fn_error $? "--with-mod-mem must be given a number" "$LINENO" 5
</span> else
cat >>confdefs.h <<_ACEOF
<span style="color: #aaaaaa">@@ -5537,13 +4338,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">@@ -5551,8 +4352,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">@@ -5574,12 +4375,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">@@ -5593,14 +4405,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">@@ -5609,13 +4422,14 @@ LTLIBOBJS=$ac_ltlibobjs
</span>
<span style="color: #000000;background-color: #ffdddd">-: ${CONFIG_STATUS=./config.status}
</span><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"
<span style="color: #000000;background-color: #ffdddd">-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
</span><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;}
<span style="color: #000000;background-color: #ffdddd">-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
</span><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">@@ -5625,17 +4439,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
</span> debug=false
ac_cs_recheck=false
ac_cs_silent=false
<span style="color: #000000;background-color: #ffdddd">-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
</span>
<span style="color: #000000;background-color: #ffdddd">-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
</span><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
<span style="color: #000000;background-color: #ffdddd">-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
</span><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">@@ -5643,23 +4458,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
<span style="color: #000000;background-color: #ffdddd">-
</span> fi
<span style="color: #000000;background-color: #ffdddd">-
-
-# 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
-
</span> as_nl='
'
export as_nl
<span style="color: #aaaaaa">@@ -5667,7 +4474,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
<span style="color: #000000;background-color: #ffdddd">-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
</span><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">@@ -5678,7 +4491,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">@@ -5701,13 +4514,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
</span> }
fi
<span style="color: #000000;background-color: #ffdddd">-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
</span>
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
<span style="color: #aaaaaa">@@ -5717,15 +4523,16 @@ fi
</span> IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
<span style="color: #000000;background-color: #ffdddd">-case $0 in
</span><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
-done
</span><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">@@ -5737,12 +4544,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
<span style="color: #000000;background-color: #ffdddd">-# 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><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">@@ -5754,7 +4565,89 @@ export LC_ALL
</span> LANGUAGE=C
export LANGUAGE
<span style="color: #000000;background-color: #ffdddd">-# Required to use basename.
</span><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">@@ -5768,8 +4661,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>
<span style="color: #000000;background-color: #ffdddd">-# Name of the executable.
</span> as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
<span style="color: #aaaaaa">@@ -5789,76 +4686,25 @@ $as_echo X/"$0" |
</span> }
s/.*/./; q'`
<span style="color: #000000;background-color: #ffdddd">-# CDPATH.
-$as_unset CDPATH
-
-
-
- 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" || {
-
- # 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; }; }
-
- # 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
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
</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>
ECHO_C= ECHO_N= ECHO_T=
<span style="color: #000000;background-color: #ffdddd">-case `echo -n x` in
</span><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
<span style="color: #000000;background-color: #ffdddd">-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
</span>
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
<span style="color: #aaaaaa">@@ -5873,49 +4719,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
<span style="color: #000000;background-color: #ffdddd">-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- 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
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
</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_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">@@ -5925,13 +4807,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>
<span style="color: #000000;background-color: #ffdddd">-# Save the log message, to keep $[0] and so on meaningful, and to
</span><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-pre3, which was
<span style="color: #000000;background-color: #ffdddd">-generated by GNU Autoconf 2.63. Invocation command line was
</span><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">@@ -5962,13 +4850,15 @@ _ACEOF
</span>
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
<span style="color: #000000;background-color: #ffdddd">-\`$as_me' instantiates files from templates according to the
-current configuration.
</span><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>
<span style="color: #000000;background-color: #ffdddd">-Usage: $0 [OPTION]... [FILE]...
</span><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">@@ -5984,16 +4874,17 @@ $config_files
</span> Configuration headers:
$config_headers
<span style="color: #000000;background-color: #ffdddd">-Report bugs to <bug-autoconf@gnu.org>."
</span><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-pre3
<span style="color: #000000;background-color: #ffdddd">-configured by $0, generated by GNU Autoconf 2.63,
- 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>
<span style="color: #000000;background-color: #ffdddd">-Copyright (C) 2008 Free Software Foundation, Inc.
</span><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">@@ -6009,11 +4900,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">@@ -6027,27 +4923,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
-Try \`$0 --help' for more information." >&2
- { (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">@@ -6055,11 +4953,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
-Try \`$0 --help' for more information." >&2
- { (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">@@ -6076,7 +4973,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">@@ -6123,9 +5020,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
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (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">@@ -6147,26 +5042,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">@@ -6174,7 +5067,13 @@ $debug ||
</span> if test -n "$CONFIG_FILES"; then
<span style="color: #000000;background-color: #ffdddd">-ac_cr='
'
</span><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">@@ -6182,7 +5081,7 @@ else
</span> ac_cs_awk_cr=$ac_cr
fi
<span style="color: #000000;background-color: #ffdddd">-echo 'BEGIN {' >"$tmp/subs1.awk" &&
</span><span style="color: #000000;background-color: #ddffdd">+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
</span> _ACEOF
<span style="color: #aaaaaa">@@ -6191,24 +5090,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
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
</span><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
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (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
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (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">@@ -6216,7 +5109,7 @@ done
</span> rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
<span style="color: #000000;background-color: #ffdddd">-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
</span><span style="color: #000000;background-color: #ddffdd">+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
</span> _ACEOF
sed -n '
h
<span style="color: #aaaaaa">@@ -6230,7 +5123,7 @@ s/'"$ac_delim"'$//
</span> t delim
:nl
h
<span style="color: #000000;background-color: #ffdddd">-s/\(.\{148\}\).*/\1/
</span><span style="color: #000000;background-color: #ddffdd">+s/\(.\{148\}\)..*/\1/
</span> t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
<span style="color: #aaaaaa">@@ -6244,7 +5137,7 @@ s/.\{148\}//
</span> t nl
:delim
h
<span style="color: #000000;background-color: #ffdddd">-s/\(.\{148\}\).*/\1/
</span><span style="color: #000000;background-color: #ddffdd">+s/\(.\{148\}\)..*/\1/
</span> t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
<span style="color: #aaaaaa">@@ -6264,7 +5157,7 @@ t delim
</span> rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
<span style="color: #000000;background-color: #ffdddd">-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
</span><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">@@ -6296,23 +5189,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
<span style="color: #000000;background-color: #ffdddd">-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- { (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
<span style="color: #000000;background-color: #ffdddd">-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
</span><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[ ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
</span><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">@@ -6324,7 +5223,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
<span style="color: #000000;background-color: #ffdddd">-cat >"$tmp/defines.awk" <<\_ACAWK ||
</span><span style="color: #000000;background-color: #ddffdd">+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
</span> BEGIN {
_ACEOF
<span style="color: #aaaaaa">@@ -6336,13 +5235,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
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
- { (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">@@ -6427,9 +5324,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
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
- { (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">@@ -6442,9 +5337,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
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
- { (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">@@ -6463,7 +5356,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">@@ -6472,12 +5365,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
</span> [\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
<span style="color: #000000;background-color: #ffdddd">- { { $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;}
- { (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">@@ -6488,7 +5379,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">@@ -6500,10 +5391,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
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (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">@@ -6531,47 +5420,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" ||
-$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_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (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">@@ -6623,7 +5472,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=
<span style="color: #000000;background-color: #ffdddd">-
</span> ac_sed_dataroot='
/datarootdir/ {
p
<span style="color: #aaaaaa">@@ -6633,12 +5481,11 @@ ac_sed_dataroot='
</span> /@docdir@/p
/@infodir@/p
/@localedir@/p
<span style="color: #000000;background-color: #ffdddd">-/@mandir@/p
-'
</span><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">@@ -6648,7 +5495,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">@@ -6675,27 +5522,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
</span> s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
"
<span style="color: #000000;background-color: #ffdddd">-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (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'
-which seems to be undefined. Please make sure it is defined." >&5
</span><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'
<span style="color: #000000;background-color: #ffdddd">-which seems to be undefined. Please make sure it is defined." >&2;}
</span><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
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (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">@@ -6704,27 +5548,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
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (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" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (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
-$as_echo "$as_me: error: could not create -" >&2;}
- { (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">@@ -6734,15 +5572,12 @@ $as_echo "$as_me: error: could not create -" >&2;}
</span> done # for ac_tag
<span style="color: #000000;background-color: #ffdddd">-{ (exit 0); exit 0; }
</span><span style="color: #000000;background-color: #ddffdd">+as_fn_exit 0
</span> _ACEOF
<span style="color: #000000;background-color: #ffdddd">-chmod +x $CONFIG_STATUS
</span> 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
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- { (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">@@ -6763,10 +5598,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-1'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/commit/2e9124099ae0471b9953f3c1ab27e30591823c5b#diff-1'>
<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-2'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/commit/2e9124099ae0471b9953f3c1ab27e30591823c5b#diff-2'>
<strong>
darshan-runtime/darshan.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-runtime/darshan.h
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-runtime/darshan.h
</span><span style="color: #aaaaaa">@@ -93,7 +93,7 @@ extern char* darshan_path_exclusions[]; /* defined in lib/darshan-core.c */
</span> * environment, allowing the module to store I/O characterization data.
* 'funcs' is a pointer to a structure containing each of the function
* pointers required by darshan-core to shut down the module. The function
<span style="color: #000000;background-color: #ffdddd">- * returns the following integers passed in as pointers: 'my_rank' is the
</span><span style="color: #000000;background-color: #ddffdd">+ * returns the following integers passed in as pointers: 'rank' is the
</span> * MPI rank of the calling process, 'mod_mem_limit' is the maximum amount
* of memory the module may use, and 'sys_mem_alignment' is the configured
* memory alignment value Darshan was configured with.
<span style="color: #aaaaaa">@@ -101,7 +101,7 @@ extern char* darshan_path_exclusions[]; /* defined in lib/darshan-core.c */
</span> void darshan_core_register_module(
darshan_module_id mod_id,
struct darshan_module_funcs *funcs,
<span style="color: #000000;background-color: #ffdddd">- int *my_rank,
</span><span style="color: #000000;background-color: #ddffdd">+ int *rank,
</span> int *mod_mem_limit,
int *sys_mem_alignment);
</code></pre>
<br>
</li>
<li id='diff-3'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/commit/2e9124099ae0471b9953f3c1ab27e30591823c5b#diff-3'>
<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">@@ -1507,12 +1507,91 @@ static void darshan_core_cleanup(struct darshan_core_runtime* core)
</span> return;
}
<span style="color: #000000;background-color: #ddffdd">+/* crude benchmarking hook into darshan-core to benchmark Darshan
+ * shutdown overhead using a variety of application I/O workloads
+ */
+extern void darshan_posix_shutdown_bench_setup();
+extern void darshan_mpiio_shutdown_bench_setup();
+void darshan_shutdown_bench(int argc, char **argv)
+{
+ /* clear out existing core runtime structure */
+ if(darshan_core)
+ {
+ darshan_core_cleanup(darshan_core);
+ darshan_core = NULL;
+ }
+
+ /***********************************************************/
+ /* restart darshan */
+ darshan_core_initialize(argc, argv);
+
+ darshan_posix_shutdown_bench_setup(1);
+ darshan_mpiio_shutdown_bench_setup(1);
+
+ if(my_rank == 0)
+ printf("# 1 unique file per proc\n");
+ DARSHAN_MPI_CALL(PMPI_Barrier)(MPI_COMM_WORLD);
+ darshan_core_shutdown();
+ darshan_core = NULL;
+
+ sleep(1);
+
+ /***********************************************************/
+ /* restart darshan */
+ darshan_core_initialize(argc, argv);
+
+ darshan_posix_shutdown_bench_setup(2);
+ darshan_mpiio_shutdown_bench_setup(2);
+
+ if(my_rank == 0)
+ printf("# 1 shared file per proc\n");
+ DARSHAN_MPI_CALL(PMPI_Barrier)(MPI_COMM_WORLD);
+ darshan_core_shutdown();
+ darshan_core = NULL;
+
+ sleep(1);
+
+ /***********************************************************/
+ /* restart darshan */
+ darshan_core_initialize(argc, argv);
+
+ darshan_posix_shutdown_bench_setup(3);
+ darshan_mpiio_shutdown_bench_setup(3);
+
+ if(my_rank == 0)
+ printf("# 1024 unique files per proc\n");
+ DARSHAN_MPI_CALL(PMPI_Barrier)(MPI_COMM_WORLD);
+ darshan_core_shutdown();
+ darshan_core = NULL;
+
+ sleep(1);
+
+ /***********************************************************/
+ /* restart darshan */
+ darshan_core_initialize(argc, argv);
+
+ darshan_posix_shutdown_bench_setup(4);
+ darshan_mpiio_shutdown_bench_setup(4);
+
+ if(my_rank == 0)
+ printf("# 1024 shared files per proc\n");
+ DARSHAN_MPI_CALL(PMPI_Barrier)(MPI_COMM_WORLD);
+ darshan_core_shutdown();
+ darshan_core = NULL;
+
+ sleep(1);
+
+ /***********************************************************/
+
+ return;
+}
+
</span> /* ********************************************************* */
void darshan_core_register_module(
darshan_module_id mod_id,
struct darshan_module_funcs *funcs,
<span style="color: #000000;background-color: #ffdddd">- int *my_rank,
</span><span style="color: #000000;background-color: #ddffdd">+ int *rank,
</span> int *mod_mem_limit,
int *sys_mem_alignment)
{
<span style="color: #aaaaaa">@@ -1554,7 +1633,8 @@ void darshan_core_register_module(
</span> darshan_core->log_header.mod_ver[mod_id] = darshan_module_versions[mod_id];
/* get the calling process's rank */
<span style="color: #000000;background-color: #ffdddd">- DARSHAN_MPI_CALL(PMPI_Comm_rank)(MPI_COMM_WORLD, my_rank);
</span><span style="color: #000000;background-color: #ddffdd">+ if(rank)
+ *rank = my_rank;
</span>
/* set the maximum amount of memory this module can use */
mod_mem_str = getenv(DARSHAN_MOD_MEM_OVERRIDE);
</code></pre>
<br>
</li>
<li id='diff-4'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/commit/2e9124099ae0471b9953f3c1ab27e30591823c5b#diff-4'>
<strong>
darshan-runtime/lib/darshan-mpiio.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-runtime/lib/darshan-mpiio.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-runtime/lib/darshan-mpiio.c
</span><span style="color: #aaaaaa">@@ -129,6 +129,33 @@ static void mpiio_shutdown(void);
</span> #define MPIIO_LOCK() pthread_mutex_lock(&mpiio_runtime_mutex)
#define MPIIO_UNLOCK() pthread_mutex_unlock(&mpiio_runtime_mutex)
<span style="color: #000000;background-color: #ddffdd">+#define MPIIO_RECORD_OPEN(__ret, __path, __fh, __comm, __mode, __info, __tm1, __tm2) do { \
+ struct mpiio_file_runtime* file; \
+ char *exclude; \
+ int tmp_index = 0; \
+ int comm_size; \
+ if(__ret != MPI_SUCCESS) break; \
+ while((exclude=darshan_path_exclusions[tmp_index])) { \
+ if(!(strncmp(exclude, __path, strlen(exclude)))) \
+ break; \
+ tmp_index++; \
+ } \
+ if(exclude) break; \
+ file = mpiio_file_by_name_setfh(__path, __fh); \
+ if(!file) break; \
+ file->file_record->counters[MPIIO_MODE] = __mode; \
+ DARSHAN_MPI_CALL(PMPI_Comm_size)(__comm, &comm_size); \
+ if(comm_size == 1) \
+ file->file_record->counters[MPIIO_INDEP_OPENS] += 1; \
+ else \
+ file->file_record->counters[MPIIO_COLL_OPENS] += 1; \
+ if(__info != MPI_INFO_NULL) \
+ file->file_record->counters[MPIIO_HINTS] += 1; \
+ if(file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] == 0) \
+ file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] = __tm1; \
+ DARSHAN_TIMER_INC_NO_OVERLAP(file->file_record->fcounters[MPIIO_F_META_TIME], __tm1, __tm2, file->last_meta_end); \
+} while(0)
+
</span> #define MPIIO_RECORD_READ(__ret, __fh, __count, __datatype, __counter, __tm1, __tm2) do { \
struct mpiio_file_runtime* file; \
int size = 0; \
<span style="color: #aaaaaa">@@ -190,57 +217,27 @@ int MPI_File_open(MPI_Comm comm, char *filename, int amode, MPI_Info info, MPI_F
</span> #endif
{
int ret;
<span style="color: #000000;background-color: #ffdddd">- struct mpiio_file_runtime* file;
</span> char* tmp;
<span style="color: #000000;background-color: #ffdddd">- int comm_size;
</span> double tm1, tm2;
tm1 = darshan_core_wtime();
ret = DARSHAN_MPI_CALL(PMPI_File_open)(comm, filename, amode, info, fh);
tm2 = darshan_core_wtime();
<span style="color: #000000;background-color: #ffdddd">- if(ret == MPI_SUCCESS)
- {
- MPIIO_LOCK();
- mpiio_runtime_initialize();
-
- /* use ROMIO approach to strip prefix if present */
- /* strip off prefix if there is one, but only skip prefixes
- * if they are greater than length one to allow for windows
- * drive specifications (e.g. c:\...)
- */
- tmp = strchr(filename, ':');
- if (tmp > filename + 1) {
- filename = tmp + 1;
- }
-
- file = mpiio_file_by_name_setfh(filename, (*fh));
- if(file)
- {
- file->file_record->counters[MPIIO_MODE] = amode;
- DARSHAN_MPI_CALL(PMPI_Comm_size)(comm, &comm_size);
- if(comm_size == 1)
- {
- file->file_record->counters[MPIIO_INDEP_OPENS] += 1;
- }
- else
- {
- file->file_record->counters[MPIIO_COLL_OPENS] += 1;
- }
- if(info != MPI_INFO_NULL)
- {
- file->file_record->counters[MPIIO_HINTS] += 1;
- }
- if(file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] == 0)
- file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] = tm1;
- DARSHAN_TIMER_INC_NO_OVERLAP(
- file->file_record->fcounters[MPIIO_F_META_TIME],
- tm1, tm2, file->last_meta_end);
- }
-
- MPIIO_UNLOCK();
</span><span style="color: #000000;background-color: #ddffdd">+ /* use ROMIO approach to strip prefix if present */
+ /* strip off prefix if there is one, but only skip prefixes
+ * if they are greater than length one to allow for windows
+ * drive specifications (e.g. c:\...)
+ */
+ tmp = strchr(filename, ':');
+ if (tmp > filename + 1) {
+ filename = tmp + 1;
</span> }
<span style="color: #000000;background-color: #ddffdd">+ MPIIO_LOCK();
+ mpiio_runtime_initialize();
+ MPIIO_RECORD_OPEN(ret, filename, (*fh), comm, amode, info, tm1, tm2);
+ MPIIO_UNLOCK();
</span> return(ret);
}
<span style="color: #aaaaaa">@@ -1286,6 +1283,83 @@ static void mpiio_shared_record_variance(MPI_Comm mod_comm,
</span> return;
}
<span style="color: #000000;background-color: #ddffdd">+/* mpiio module shutdown benchmark routine */
+void darshan_mpiio_shutdown_bench_setup(int test_case)
+{
+ char filepath[256];
+ MPI_File *fh_array;
+ int64_t *size_array;
+ int i;
+ intptr_t j;
+
+ if(mpiio_runtime)
+ mpiio_shutdown();
+
+ mpiio_runtime_initialize();
+
+ srand(my_rank);
+ fh_array = malloc(1024 * sizeof(MPI_File));
+ size_array = malloc(DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT * sizeof(int64_t));
+ assert(fh_array && size_array);
+
+ for(j = 0; j < 1024; j++)
+ fh_array[j] = (MPI_File)j;
+ for(i = 0; i < DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT; i++)
+ size_array[i] = rand();
+
+ switch(test_case)
+ {
+ case 1: /* single file-per-process */
+ snprintf(filepath, 256, "fpp-0_rank-%d", my_rank);
+
+ MPIIO_RECORD_OPEN(MPI_SUCCESS, filepath, fh_array[0], MPI_COMM_SELF,
+ 2, MPI_INFO_NULL, 0, 1);
+ MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[0], size_array[0], MPI_BYTE,
+ MPIIO_INDEP_WRITES, 1, 2);
+
+ break;
+ case 2: /* single shared file */
+ snprintf(filepath, 256, "shared-0");
+
+ MPIIO_RECORD_OPEN(MPI_SUCCESS, filepath, fh_array[0], MPI_COMM_WORLD,
+ 2, MPI_INFO_NULL, 0, 1);
+ MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[0], size_array[0], MPI_BYTE,
+ MPIIO_COLL_WRITES, 1, 2);
+
+ break;
+ case 3: /* 1024 unique files per proc */
+ for(i = 0; i < 1024; i++)
+ {
+ snprintf(filepath, 256, "fpp-%d_rank-%d", i , my_rank);
+
+ MPIIO_RECORD_OPEN(MPI_SUCCESS, filepath, fh_array[i], MPI_COMM_SELF,
+ 2, MPI_INFO_NULL, 0, 1);
+ MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[i],
+ size_array[i % DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT],
+ MPI_BYTE, MPIIO_INDEP_WRITES, 1, 2);
+ }
+
+ break;
+ case 4: /* 1024 shared files per proc */
+ for(i = 0; i < 1024; i++)
+ {
+ snprintf(filepath, 256, "shared-%d", i);
+
+ MPIIO_RECORD_OPEN(MPI_SUCCESS, filepath, fh_array[i], MPI_COMM_WORLD,
+ 2, MPI_INFO_NULL, 0, 1);
+ MPIIO_RECORD_WRITE(MPI_SUCCESS, fh_array[i],
+ size_array[i % DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT],
+ MPI_BYTE, MPIIO_COLL_WRITES, 1, 2);
+ }
+ break;
+ default:
+ fprintf(stderr, "Error: invalid Darshan benchmark test case.\n");
+ return;
+ }
+
+ return;
+}
+
</span> /**************************************************************************
* Functions exported by MPI-IO module for coordinating with darshan-core *
**************************************************************************/
<span style="color: #aaaaaa">@@ -1452,6 +1526,7 @@ static void mpiio_shutdown()
</span> free(mpiio_runtime->file_record_array);
free(mpiio_runtime);
mpiio_runtime = NULL;
<span style="color: #000000;background-color: #ddffdd">+ instrumentation_disabled = 0;
</span>
return;
}
</code></pre>
<br>
</li>
<li id='diff-5'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/commit/2e9124099ae0471b9953f3c1ab27e30591823c5b#diff-5'>
<strong>
darshan-runtime/lib/darshan-posix.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-runtime/lib/darshan-posix.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-runtime/lib/darshan-posix.c
</span><span style="color: #aaaaaa">@@ -2017,6 +2017,78 @@ static void posix_shared_record_variance(MPI_Comm mod_comm,
</span> return;
}
<span style="color: #000000;background-color: #ddffdd">+/* posix module shutdown benchmark routine */
+void darshan_posix_shutdown_bench_setup(int test_case)
+{
+ char filepath[256];
+ int *fd_array;
+ int64_t *size_array;
+ int i;
+
+ if(posix_runtime)
+ posix_shutdown();
+
+ posix_runtime_initialize();
+
+ srand(my_rank);
+ fd_array = malloc(1024 * sizeof(int));
+ size_array = malloc(DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT * sizeof(int64_t));
+ assert(fd_array && size_array);
+
+ for(i = 0; i < 1024; i++)
+ fd_array[i] = i;
+ for(i = 0; i < DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT; i++)
+ size_array[i] = rand();
+
+ switch(test_case)
+ {
+ case 1: /* single file-per-process */
+ snprintf(filepath, 256, "fpp-0_rank-%d", my_rank);
+
+ POSIX_RECORD_OPEN(fd_array[0], filepath, 777, 0, 0, 1);
+ POSIX_RECORD_WRITE(size_array[0], fd_array[0], 0, 0, 1, 0, 1, 2);
+
+ break;
+ case 2: /* single shared file */
+ snprintf(filepath, 256, "shared-0");
+
+ POSIX_RECORD_OPEN(fd_array[0], filepath, 777, 0, 0, 1);
+ POSIX_RECORD_WRITE(size_array[0], fd_array[0], 0, 0, 1, 0, 1, 2);
+
+ break;
+ case 3: /* 1024 unique files per proc */
+ for(i = 0; i < 1024; i++)
+ {
+ snprintf(filepath, 256, "fpp-%d_rank-%d", i , my_rank);
+
+ POSIX_RECORD_OPEN(fd_array[i], filepath, 777, 0, 0, 1);
+ POSIX_RECORD_WRITE(size_array[i % DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT],
+ fd_array[i], 0, 0, 1, 0, 1, 2);
+ }
+
+ break;
+ case 4: /* 1024 shared files per proc */
+ for(i = 0; i < 1024; i++)
+ {
+ snprintf(filepath, 256, "shared-%d", i);
+
+ POSIX_RECORD_OPEN(fd_array[i], filepath, 777, 0, 0, 1);
+ POSIX_RECORD_WRITE(size_array[i % DARSHAN_COMMON_VAL_MAX_RUNTIME_COUNT],
+ fd_array[i], 0, 0, 1, 0, 1, 2);
+ }
+
+ break;
+ default:
+ fprintf(stderr, "Error: invalid Darshan benchmark test case.\n");
+ return;
+ }
+
+ free(fd_array);
+ free(size_array);
+
+ return;
+}
+
</span> /************************************************************************
* Functions exported by this module for coordinating with darshan-core *
************************************************************************/
<span style="color: #aaaaaa">@@ -2189,6 +2261,7 @@ static void posix_shutdown()
</span> free(posix_runtime->file_record_array);
free(posix_runtime);
posix_runtime = NULL;
<span style="color: #000000;background-color: #ddffdd">+ instrumentation_disabled = 0;
</span>
return;
}
</code></pre>
<br>
</li>
<li id='diff-6'>
<a href='https://xgitlab.cels.anl.gov/darshan/darshan/commit/2e9124099ae0471b9953f3c1ab27e30591823c5b#diff-6'>
<strong>
darshan-test/darshan-shutdown-bench.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/darshan-test/darshan-shutdown-bench.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/darshan-test/darshan-shutdown-bench.c
</span><span style="color: #aaaaaa">@@ -1,5 +1,5 @@
</span> /*
<span style="color: #000000;background-color: #ffdddd">- * (C) 2009 by Argonne National Laboratory.
</span><span style="color: #000000;background-color: #ddffdd">+ * (C) 2015 by Argonne National Laboratory.
</span> * See COPYRIGHT in top-level directory.
*/
<span style="color: #aaaaaa">@@ -20,16 +20,11 @@
</span> * benchmarking hooks for us. This should only be used by special-purpose
* benchmarking tools.
*/
<span style="color: #000000;background-color: #ffdddd">-void darshan_shutdown_bench(int argc, char** argv, int rank, int nprocs);
</span><span style="color: #000000;background-color: #ddffdd">+void darshan_shutdown_bench(int argc, char** argv);
</span>
int main(int argc, char **argv)
{
<span style="color: #000000;background-color: #ffdddd">- int nprocs;
- int mynod;
-
</span> MPI_Init(&argc, &argv);
<span style="color: #000000;background-color: #ffdddd">- MPI_Comm_rank(MPI_COMM_WORLD, &mynod);
- MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
</span>
if(argc != 1)
{
<span style="color: #aaaaaa">@@ -38,7 +33,7 @@ int main(int argc, char **argv)
</span> return(-1);
}
<span style="color: #000000;background-color: #ffdddd">- darshan_shutdown_bench(argc, argv, mynod, nprocs);
</span><span style="color: #000000;background-color: #ddffdd">+ darshan_shutdown_bench(argc, argv);
</span>
MPI_Finalize();
return(0);
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/2e9124099ae0471b9953f3c1ab27e30591823c5b">View it on GitLab</a>.
<br>
You're receiving this email because of your account on xgitlab.cels.anl.gov.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://xgitlab.cels.anl.gov/darshan/darshan/commit/2e9124099ae0471b9953f3c1ab27e30591823c5b"}}</script>
</p>
</div>
</body>
</html>