Changeset 9022

Timestamp:

08/22/11 19:20:29 (22 months ago)

Author:

mtmoore

Message:

updates to support kernels newer than 2.6.38. Changes include use of DEFINE_SPINLOCK, change file_system_type struct to use mount instead of get_sb, and add a flag to dirty_inode member of super_operations. In all cases, leave previous behavior in place when newer and older options both exist.

Location:

branches/Orange-Branch

Files:

• configure (modified) (235 diffs)
• maint/config/kernel.m4 (modified) (4 diffs)
• pvfs2-config.h.in (modified) (4 diffs)
• src/kernel/linux-2.6/pvfs2-bufmap.c (modified) (1 diff)
• src/kernel/linux-2.6/pvfs2-cache.c (modified) (1 diff)
• src/kernel/linux-2.6/pvfs2-kernel.h (modified) (6 diffs)
• src/kernel/linux-2.6/pvfs2-mod.c (modified) (2 diffs)
• src/kernel/linux-2.6/super.c (modified) (10 diffs)

branches/Orange-Branch/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65.
+# Generated by GNU Autoconf 2.68.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
@@ -90 +90 @@
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
@@ -215 +216 @@
         # 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
         export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+        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+"$@"}
 fi
 
@@ -317 +325 @@
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
@@ -357 +365 @@
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# 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.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  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: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
@@ -531 +539 @@
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -852 +860 @@
 
   case $ac_option in
-  *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)    ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
@@ -898 +907 @@
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
@@ -924 +933 @@
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
@@ -1128 +1137 @@
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
@@ -1144 +1153 @@
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
@@ -1174 +1183 @@
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
@@ -1183 +1192 @@
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
@@ -1193 +1202 @@
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1201 +1210 @@
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
@@ -1207 +1216 @@
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
@@ -1230 +1239 @@
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
@@ -1244 +1253 @@
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $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
+    $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
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1260 +1269 @@
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
@@ -1301 +1310 @@
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-        cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+        cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
         pwd)`
 # When building in place, set srcdir=.
@@ -1345 +1354 @@
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
@@ -1555 +1564 @@
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.65
-
-Copyright (C) 2009 Free Software Foundation, Inc.
+generated by GNU Autoconf 2.68
+
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
@@ -1601 +1610 @@
         ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1627 +1636 @@
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
          test ! -s conftest.err
@@ -1638 +1647 @@
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1651 +1660 @@
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
@@ -1690 +1699 @@
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+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; }
@@ -1717 +1726 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -1726 +1735 @@
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
@@ -1767 +1776 @@
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1781 +1790 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -1799 +1808 @@
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -1976 +1985 @@
 
   fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -2022 +2031 @@
   # 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -2035 +2044 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2090 +2099 @@
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -2098 +2107 @@
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2208 +2217 @@
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
@@ -2246 +2253 @@
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
@@ -2263 +2268 @@
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
@@ -2281 +2284 @@
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
@@ -2340 +2341 @@
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # 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
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
@@ -2355 +2361 @@
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$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; }
   fi
 done
@@ -2431 +2441 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
@@ -2447 +2457 @@
 ac_aux_dir=
 for ac_dir in maint/config "$srcdir"/maint/config; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in maint/config \"$srcdir\"/maint/config" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in maint/config \"$srcdir\"/maint/config" "$LINENO" 5
 fi
 
@@ -2503 +2519 @@
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2514 +2530 @@
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
@@ -2523 +2539 @@
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
@@ -2541 +2557 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2548 +2564 @@
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
@@ -2556 +2572 @@
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
@@ -2591 +2607 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2631 +2647 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2684 +2700 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2724 +2740 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2783 +2799 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2827 +2843 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2881 +2897 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
@@ -2996 +3012 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+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
@@ -3040 +3055 @@
   { { $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 compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
@@ -3098 +3113 @@
         { { $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.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
@@ -3111 +3126 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3151 +3166 @@
 { { $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 compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -3162 +3177 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3199 +3214 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3277 +3292 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3385 +3400 @@
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3415 +3430 @@
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
@@ -3431 +3446 @@
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
@@ -3474 +3489 @@
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
@@ -3490 +3505 @@
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
@@ -3500 +3515 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
@@ -3513 +3528 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3562 +3577 @@
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
@@ -3576 +3591 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3628 +3643 @@
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
@@ -3643 +3658 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3760 +3775 @@
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -3772 +3786 @@
 
 ac_fn_c_check_header_mongrel "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default"
-if test "x$ac_cv_header_pwd_h" = x""yes; then :
+if test "x$ac_cv_header_pwd_h" = xyes; then :
 
 $as_echo "#define HAVE_GETPWUID 1" >>confdefs.h
@@ -3780 +3794 @@
 
 ac_fn_c_check_header_mongrel "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_vfs_h" = x""yes; then :
+if test "x$ac_cv_header_sys_vfs_h" = xyes; then :
 
 $as_echo "#define HAVE_SYS_VFS_H 1" >>confdefs.h
@@ -3788 +3802 @@
 
 ac_fn_c_check_header_mongrel "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mount_h" = x""yes; then :
+if test "x$ac_cv_header_sys_mount_h" = xyes; then :
 
 $as_echo "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h
@@ -3800 +3814 @@
   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"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -3814 +3827 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdarg_h" = x""yes; then :
+if test "x$ac_cv_header_stdarg_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDARG_H 1
@@ -3827 +3840 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
-if test "x$ac_cv_header_attr_xattr_h" = x""yes; then :
+if test "x$ac_cv_header_attr_xattr_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ATTR_XATTR_H 1
@@ -3839 +3852 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_xattr_h" = x""yes; then :
+if test "x$ac_cv_header_sys_xattr_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_XATTR_H 1
@@ -3855 +3868 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5
 $as_echo_n "checking size of long int... " >&6; }
-if test "${ac_cv_sizeof_long_int+set}" = set; then :
+if ${ac_cv_sizeof_long_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3864 +3877 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long int)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (long int)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long_int=0
@@ -3901 +3913 @@
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3987 +3999 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4027 +4039 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4080 +4092 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4120 +4132 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4179 +4191 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4223 +4235 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4277 +4289 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
@@ -4307 +4319 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4344 +4356 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4422 +4434 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4521 +4533 @@
 $as_echo_n "checking for required gcc... " >&6; }
 if test "x$GCC" = "x"; then
-        as_fn_error "no" "$LINENO" 5
+        as_fn_error $? "no" "$LINENO" 5
 fi
 
@@ -4538 +4550 @@
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4568 +4580 @@
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
@@ -4584 +4596 @@
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
@@ -4627 +4639 @@
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
@@ -4643 +4655 @@
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
@@ -4653 +4665 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
@@ -4667 +4679 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_HAVE_PERL+set}" = set; then :
+if ${ac_cv_prog_HAVE_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4702 +4714 @@
 
 if test $HAVE_PERL = "no"; then
-    as_fn_error "\"perl required in PATH to complete build\"" "$LINENO" 5
+    as_fn_error $? "\"perl required in PATH to complete build\"" "$LINENO" 5
 fi
 
@@ -4709 +4721 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_HAVE_FIND+set}" = set; then :
+if ${ac_cv_prog_HAVE_FIND+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4744 +4756 @@
 
 if test $HAVE_FIND = "no"; then
-    as_fn_error "\"find required in PATH complete build\"" "$LINENO" 5
+    as_fn_error $? "\"find required in PATH complete build\"" "$LINENO" 5
 fi
 
@@ -4751 +4763 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_HAVE_BISON+set}" = set; then :
+if ${ac_cv_prog_HAVE_BISON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4786 +4798 @@
 
 if test $HAVE_BISON = "no"; then
-    as_fn_error "\"bison required in PATH to complete build\"" "$LINENO" 5
+    as_fn_error $? "\"bison required in PATH to complete build\"" "$LINENO" 5
 fi
 
@@ -4793 +4805 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_HAVE_FLEX+set}" = set; then :
+if ${ac_cv_prog_HAVE_FLEX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4828 +4840 @@
 
 if test $HAVE_FLEX = "no"; then
-    as_fn_error "\"flex required in PATH to complete build\"" "$LINENO" 5
+    as_fn_error $? "\"flex required in PATH to complete build\"" "$LINENO" 5
 fi
 
@@ -4835 +4847 @@
 perl -e "use Math::BigInt" 2>&1 > /dev/null
 if test $? != 0; then
-        as_fn_error "no" "$LINENO" 5
+        as_fn_error $? "no" "$LINENO" 5
 else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -4848 +4860 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_BUILD_CC+set}" = set; then :
+if ${ac_cv_prog_BUILD_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5007 +5019 @@
 
 else
-  as_fn_error "Invalid openssl path specified.  No openssl/bio.h found." "$LINENO" 5
+  as_fn_error $? "Invalid openssl path specified.  No openssl/bio.h found." "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -5026 +5038 @@
 $as_echo "yes" >&6; }
 else
-  as_fn_error "could not find openssl libs" "$LINENO" 5
+  as_fn_error $? "could not find openssl libs" "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -5038 +5050 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "openssl/evp.h" "ac_cv_header_openssl_evp_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_evp_h" = x""yes; then :
+if test "x$ac_cv_header_openssl_evp_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENSSL_EVP_H 1
@@ -5050 +5062 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_crypto_h" = x""yes; then :
+if test "x$ac_cv_header_openssl_crypto_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENSSL_CRYPTO_H 1
@@ -5111 +5123 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "openssl/evp.h" "ac_cv_header_openssl_evp_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_evp_h" = x""yes; then :
+if test "x$ac_cv_header_openssl_evp_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENSSL_EVP_H 1
@@ -5123 +5135 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_crypto_h" = x""yes; then :
+if test "x$ac_cv_header_openssl_crypto_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENSSL_CRYPTO_H 1
@@ -5199 +5211 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_HAVE_PKGCONFIG+set}" = set; then :
+if ${ac_cv_prog_HAVE_PKGCONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5331 +5343 @@
 
        if test "$set_redhat24" = 0 || test "$set_nptl_workaround" = 0 ; then
-           as_fn_error "
+           as_fn_error $? "
     You appear to be configuring PVFS2 on a RedHat distribution that
     likely ships with a heavily modified kernel and c library.  You must
@@ -5444 +5456 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5662 +5674 @@
      ;; #(
    *)
-     as_fn_error "unknown endianness
+     as_fn_error $? "unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
@@ -5673 +5685 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
 $as_echo_n "checking size of void *... " >&6; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then :
+if ${ac_cv_sizeof_void_p+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5682 +5694 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (void *)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (void *)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_void_p=0
@@ -5730 +5741 @@
 if test "${with_tau+set}" = set; then :
   withval=$with_tau; if test "x$withval" = "xyes" ; then
-           as_fn_error "--with-tau must be given a pathname" "$LINENO" 5
+           as_fn_error $? "--with-tau must be given a pathname" "$LINENO" 5
     else
        TAU_INCS="-I$withval/include"
@@ -5737 +5748 @@
        tau_mkfile=$withval/$(uname -m)/lib/Makefile.*-profile-trace
        if test ! -f $tau_mkfile; then
-           as_fn_error "TAU not compiled with profiling and tracing support" "$LINENO" 5
+           as_fn_error $? "TAU not compiled with profiling and tracing support" "$LINENO" 5
        fi
        tau_config=$(echo $tau_mkfile | sed -e "s|.*Makefile.tau-||")
@@ -5759 +5770 @@
 if test "${with_kernel+set}" = set; then :
   withval=$with_kernel; if test "x$withval" = "xyes" -o "x$withval" = "x" ; then
-           as_fn_error "--with-kernel must be given the path to your kernel source." "$LINENO" 5
+           as_fn_error $? "--with-kernel must be given the path to your kernel source." "$LINENO" 5
     fi
     if ! test -d $withval ; then
-           as_fn_error "The --with-kernel path $withval is not a directory." "$LINENO" 5
+           as_fn_error $? "The --with-kernel path $withval is not a directory." "$LINENO" 5
     fi
     if ! test -r $withval/include/linux/version.h ; then
-       as_fn_error "The kernel source tree must have been configured." "$LINENO" 5
+       as_fn_error $? "The kernel source tree must have been configured." "$LINENO" 5
     fi
 
@@ -5775 +5786 @@
         vers=`sed -n '/UTS_RELEASE/{; s/.*"\(0-9\.0-9\).*".*/\1/; p; }' $withval/include/generated/utsrelease.h`
     else
-        as_fn_error "The kernel source tree does not appear to be 2.6" "$LINENO" 5
+        as_fn_error $? "The kernel source tree does not appear to be 2.6" "$LINENO" 5
     fi
 
@@ -5794 +5805 @@
 if test "${with_kernel24+set}" = set; then :
   withval=$with_kernel24; if test "x$withval" = "xyes" -o "x$withval" = "x" ; then
-           as_fn_error "--with-kernel24 must be given the path to your kernel 2.4.x source." "$LINENO" 5
+           as_fn_error $? "--with-kernel24 must be given the path to your kernel 2.4.x source." "$LINENO" 5
     fi
     if ! test -d $withval ; then
-           as_fn_error "The --with-kernel path $withval is not a directory." "$LINENO" 5
+           as_fn_error $? "The --with-kernel path $withval is not a directory." "$LINENO" 5
     fi
     if ! test -r $withval/include/linux/version.h ; then
-       as_fn_error "The kernel source tree must have been configured." "$LINENO" 5
+       as_fn_error $? "The kernel source tree must have been configured." "$LINENO" 5
     fi
     vers=`sed -n '/UTS_RELEASE/{; s/.*"\(0-9\.0-9\).*".*/\1/; p; }' $withval/include/linux/version.h`
     if ! grep -q UTS_RELEASE..2\\.4\\. $withval/include/linux/version.h ; then
-       as_fn_error "The kernel source tree does not appear to be 2.4" "$LINENO" 5
+       as_fn_error $? "The kernel source tree does not appear to be 2.4" "$LINENO" 5
     fi
     k24_minor_ver=`echo $vers | cut -b 26- | sed -n 's/\"//p' | head -n 1`
@@ -5855 +5866 @@
         NOSTDINCFLAGS="-Werror-implicit-function-declaration -nostdinc -isystem `$CC -print-file-name=include`"
 
-        CFLAGS="$USR_CFLAGS $NOSTDINCFLAGS -I$lk_src/include -I$lk_src/include/asm/mach-default -DKBUILD_STR(s)=#s -DKBUILD_BASENAME=KBUILD_STR(empty)  -DKBUILD_MODNAME=KBUILD_STR(empty)"
+                                CFLAGS="-O2 $USR_CFLAGS $NOSTDINCFLAGS -I$lk_src/include -I$lk_src/include/asm/mach-default -DKBUILD_STR(s)=#s -DKBUILD_BASENAME=KBUILD_STR(empty)  -DKBUILD_MODNAME=KBUILD_STR(empty)"
 
                 if test -f $lk_src/include/generated/autoconf.h ; then
@@ -6810 +6821 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_sb_nodev" >&5
+$as_echo_n "checking for get_sb_nodev... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                int v_fill_sb(struct super_block *sb, void *data, int s)
+                {
+                        return 0;
+                }
+
+int
+main ()
+{
+
+                        int ret = 0;
+                        struct super_block *sb = NULL;
+#ifdef HAVE_VFSMOUNT_GETSB
+                        ret = get_sb_nodev(NULL, 0, NULL, v_fill_sb, NULL );
+#else
+                        sb = get_sb_nodev(NULL, 0, NULL, v_fill_sb);
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_GETSB_NODEV 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file_system_type get_sb" >&5
+$as_echo_n "checking for file_system_type get_sb... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+
+int
+main ()
+{
+
+                    struct file_system_type f;
+                    f.get_sb = NULL;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_FSTYPE_GET_SB 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file_system_type mount exclusively" >&5
+$as_echo_n "checking for file_system_type mount exclusively... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+
+int
+main ()
+{
+
+#ifdef HAVE_FSTYPE_GET_SB
+                    assert(0);
+#else
+                    struct file_system_type f;
+                    f.mount = NULL;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_FSTYPE_MOUNT_ONLY 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xattr support in kernel" >&5
 $as_echo_n "checking for xattr support in kernel... " >&6; }
@@ -6972 +7094 @@
 
 "
-if test "x$ac_cv_header_linux_posix_acl_h" = x""yes; then :
+if test "x$ac_cv_header_linux_posix_acl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_POSIX_ACL_H 1
@@ -6991 +7113 @@
 
 "
-if test "x$ac_cv_header_linux_posix_acl_xattr_h" = x""yes; then :
+if test "x$ac_cv_header_linux_posix_acl_xattr_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_POSIX_ACL_XATTR_H 1
@@ -7010 +7132 @@
 
 "
-if test "x$ac_cv_header_linux_xattr_acl_h" = x""yes; then :
+if test "x$ac_cv_header_linux_xattr_acl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_XATTR_ACL_H 1
@@ -7026 +7148 @@
 
 "
-if test "x$ac_cv_header_linux_mount_h" = x""yes; then :
+if test "x$ac_cv_header_linux_mount_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_MOUNT_H 1
@@ -7041 +7163 @@
 
 "
-if test "x$ac_cv_header_linux_ioctl32_h" = x""yes; then :
+if test "x$ac_cv_header_linux_ioctl32_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_IOCTL32_H 1
@@ -7056 +7178 @@
 
 "
-if test "x$ac_cv_header_linux_compat_h" = x""yes; then :
+if test "x$ac_cv_header_linux_compat_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_COMPAT_H 1
@@ -7071 +7193 @@
 
 "
-if test "x$ac_cv_header_linux_syscalls_h" = x""yes; then :
+if test "x$ac_cv_header_linux_syscalls_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_SYSCALLS_H 1
@@ -7086 +7208 @@
 
 "
-if test "x$ac_cv_header_asm_ioctl32_h" = x""yes; then :
+if test "x$ac_cv_header_asm_ioctl32_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ASM_IOCTL32_H 1
@@ -7101 +7223 @@
 
 "
-if test "x$ac_cv_header_linux_exportfs_h" = x""yes; then :
+if test "x$ac_cv_header_linux_exportfs_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_EXPORTFS_H 1
@@ -7109 +7231 @@
 
 done
+
+
+                ac_fn_c_check_header_compile "$LINENO" "linux/smp_lock.h" "ac_cv_header_linux_smp_lock_h" "#define __KERNEL__
+                 #include <linux/smp_lock.h>
+
+"
+if test "x$ac_cv_header_linux_smp_lock_h" = xyes; then :
+
+fi
+
 
 
@@ -8990 +9122 @@
         CFLAGS=$tmp_cflags
 
+                        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPIN_LOCK_UNLOCKED " >&5
+$as_echo_n "checking for SPIN_LOCK_UNLOCKED ... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/spinlock.h>
+                spinlock_t test_lock = SPIN_LOCK_UNLOCKED;
+                struct inode *i;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_SPIN_LOCK_UNLOCKED 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
+
+                tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_sb " >&5
+$as_echo_n "checking for get_sb ... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                struct file_system_type f;
+
+int
+main ()
+{
+
+                f.get_sb = NULL;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_GET_SB_MEMBER_FILE_SYSTEM_TYPE 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirty_inode flag" >&5
+$as_echo_n "checking for dirty_inode flag... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                void di(struct inode *i, int f)
+                {
+                        return;
+                }
+
+int
+main ()
+{
+
+                        struct super_operations s;
+                        s.dirty_inode = di;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_DIRTY_INODE_FLAGS 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
 
         CFLAGS=$oldcflags
@@ -9036 +9272 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_HAVE_PKGCONFIG+set}" = set; then :
+if ${ac_cv_prog_HAVE_PKGCONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9084 +9320 @@
 
     else
-            as_fn_error "FUSE: FUSE library not found. Check LD_LIBRARY_PATH." "$LINENO" 5
+            as_fn_error $? "FUSE: FUSE library not found. Check LD_LIBRARY_PATH." "$LINENO" 5
     fi
   else
-          as_fn_error "FUSE: pkg-config not available. Please install pkg-config." "$LINENO" 5
+          as_fn_error $? "FUSE: pkg-config not available. Please install pkg-config." "$LINENO" 5
   fi
 }
@@ -9133 +9369 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
+if test "x$ac_cv_header_sys_epoll_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_EPOLL_H 1
@@ -9237 +9473 @@
 
 if test "x$build_shared" = "xno" -a "x$build_static" = "xno" ; then
-    as_fn_error "Must do --enable-shared or --enable-static or both." "$LINENO" 5
+    as_fn_error $? "Must do --enable-shared or --enable-static or both." "$LINENO" 5
 fi
 
@@ -9286 +9522 @@
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -lefence" >&5
 $as_echo_n "checking for malloc in -lefence... " >&6; }
-if test "${ac_cv_lib_efence_malloc+set}" = set; then :
+if ${ac_cv_lib_efence_malloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9320 +9556 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_malloc" >&5
 $as_echo "$ac_cv_lib_efence_malloc" >&6; }
-if test "x$ac_cv_lib_efence_malloc" = x""yes; then :
+if test "x$ac_cv_lib_efence_malloc" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBEFENCE 1
@@ -9431 +9667 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "Invalid libdb path specified. No db.h found.
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "Invalid libdb path specified. No db.h found.
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -9486 +9722 @@
         LIBS=$oldlibs
     if test "x$lib" = "xnotfound" ; then
-           as_fn_error "could not find DB libraries" "$LINENO" 5
+           as_fn_error $? "could not find DB libraries" "$LINENO" 5
     else
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lib" >&5
@@ -9854 +10090 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "Invalid libdb path specified. No db.h found.
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "Invalid libdb path specified. No db.h found.
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -9909 +10145 @@
         LIBS=$oldlibs
     if test "x$lib" = "xnotfound" ; then
-           as_fn_error "could not find DB libraries" "$LINENO" 5
+           as_fn_error $? "could not find DB libraries" "$LINENO" 5
     else
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lib" >&5
@@ -10291 +10527 @@
 $as_echo "yes" >&6; }
 else
-  as_fn_error "failed attempting to link lio_listio" "$LINENO" 5
+  as_fn_error $? "failed attempting to link lio_listio" "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -10324 +10560 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default"
-if test "x$ac_cv_header_netdb_h" = x""yes; then :
+if test "x$ac_cv_header_netdb_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NETDB_H 1
@@ -10336 +10572 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
-if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
+if test "x$ac_cv_header_arpa_inet_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ARPA_INET_H 1
@@ -10348 +10584 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_socket_h" = x""yes; then :
+if test "x$ac_cv_header_sys_socket_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_SOCKET_H 1
@@ -10430 +10666 @@
         BUILD_BMI_TCP=
     else
-        as_fn_error "Option --with-tcp requires yes/no argument." "$LINENO" 5
+        as_fn_error $? "Option --with-tcp requires yes/no argument." "$LINENO" 5
     fi
 
@@ -10443 +10679 @@
 if test "${with_gm+set}" = set; then :
   withval=$with_gm; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-gm requires the path to your GM tree." "$LINENO" 5
+            as_fn_error $? "Option --with-gm requires the path to your GM tree." "$LINENO" 5
         elif test "$withval" != no ; then
             gm_home="$withval"
@@ -10454 +10690 @@
 if test "${with_gm_includes+set}" = set; then :
   withval=$with_gm_includes; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-gm-includes requires path to GM headers." "$LINENO" 5
+            as_fn_error $? "Option --with-gm-includes requires path to GM headers." "$LINENO" 5
         elif test "$withval" != no ; then
             GM_INCDIR="$withval"
@@ -10465 +10701 @@
 if test "${with_gm_libs+set}" = set; then :
   withval=$with_gm_libs; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-gm-libs requires path to GM libraries." "$LINENO" 5
+            as_fn_error $? "Option --with-gm-libs requires path to GM libraries." "$LINENO" 5
         elif test "$withval" != no ; then
             GM_LIBDIR="$withval"
@@ -10487 +10723 @@
         CPPFLAGS="$CPPFLAGS -I$GM_INCDIR -I$GM_INCDIR/gm"
         ac_fn_c_check_header_mongrel "$LINENO" "gm.h" "ac_cv_header_gm_h" "$ac_includes_default"
-if test "x$ac_cv_header_gm_h" = x""yes; then :
-
-else
-  as_fn_error "Header gm.h not found." "$LINENO" 5
+if test "x$ac_cv_header_gm_h" = xyes; then :
+
+else
+  as_fn_error $? "Header gm.h not found." "$LINENO" 5
 fi
 
@@ -10496 +10732 @@
                         if test ! -f $GM_LIBDIR/libgm.so ; then
             if test ! -f $GM_LIBDIR/libgm.a ; then
-                as_fn_error "Neither GM library libgm.so or libgm.a found." "$LINENO" 5
+                as_fn_error $? "Neither GM library libgm.so or libgm.a found." "$LINENO" 5
             fi
         fi
@@ -10513 +10749 @@
 if test "${with_mx+set}" = set; then :
   withval=$with_mx; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-mx requires the path to your MX tree." "$LINENO" 5
+            as_fn_error $? "Option --with-mx requires the path to your MX tree." "$LINENO" 5
         elif test "$withval" != no ; then
             mx_home="$withval"
@@ -10524 +10760 @@
 if test "${with_mx_includes+set}" = set; then :
   withval=$with_mx_includes; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-mx-includes requires path to MX headers." "$LINENO" 5
+            as_fn_error $? "Option --with-mx-includes requires path to MX headers." "$LINENO" 5
         elif test "$withval" != no ; then
             MX_INCDIR="$withval"
@@ -10535 +10771 @@
 if test "${with_mx_libs+set}" = set; then :
   withval=$with_mx_libs; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-mx-libs requires path to MX libraries." "$LINENO" 5
+            as_fn_error $? "Option --with-mx-libs requires path to MX libraries." "$LINENO" 5
         elif test "$withval" != no ; then
             MX_LIBDIR="$withval"
@@ -10557 +10793 @@
         CPPFLAGS="$CPPFLAGS -I$MX_INCDIR -I$MX_INCDIR/mx"
         ac_fn_c_check_header_mongrel "$LINENO" "myriexpress.h" "ac_cv_header_myriexpress_h" "$ac_includes_default"
-if test "x$ac_cv_header_myriexpress_h" = x""yes; then :
-
-else
-  as_fn_error "Header myriexpress.h not found." "$LINENO" 5
+if test "x$ac_cv_header_myriexpress_h" = xyes; then :
+
+else
+  as_fn_error $? "Header myriexpress.h not found." "$LINENO" 5
 fi
 
@@ -10566 +10802 @@
                         if test ! -f $MX_LIBDIR/libmyriexpress.so ; then
             if test ! -f $MX_LIBDIR/libmyriexpress.a ; then
-                as_fn_error "Neither MX library libmyriexpress.so or libmyriexpress.a found." "$LINENO" 5
+                as_fn_error $? "Neither MX library libmyriexpress.so or libmyriexpress.a found." "$LINENO" 5
             fi
         fi
@@ -10609 +10845 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-            as_fn_error "Function mx_decompose_endpoint_addr2() not found." "$LINENO" 5
+            as_fn_error $? "Function mx_decompose_endpoint_addr2() not found." "$LINENO" 5
 
 fi
@@ -10627 +10863 @@
 if test "${with_ib+set}" = set; then :
   withval=$with_ib; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-ib requires the path to your IB tree." "$LINENO" 5
+            as_fn_error $? "Option --with-ib requires the path to your IB tree." "$LINENO" 5
         elif test "$withval" != no ; then
             ib_home="$withval"
@@ -10638 +10874 @@
 if test "${with_ib_includes+set}" = set; then :
   withval=$with_ib_includes; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-ib-includes requires path to IB headers." "$LINENO" 5
+            as_fn_error $? "Option --with-ib-includes requires path to IB headers." "$LINENO" 5
         elif test "$withval" != no ; then
             IB_INCDIR="$withval"
@@ -10649 +10885 @@
 if test "${with_ib_libs+set}" = set; then :
   withval=$with_ib_libs; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-ib-libs requires path to IB libraries." "$LINENO" 5
+            as_fn_error $? "Option --with-ib-libs requires path to IB libraries." "$LINENO" 5
         elif test "$withval" != no ; then
             IB_LIBDIR="$withval"
@@ -10671 +10907 @@
         CPPFLAGS="$CPPFLAGS -I$IB_INCDIR"
         ac_fn_c_check_header_mongrel "$LINENO" "vapi.h" "ac_cv_header_vapi_h" "$ac_includes_default"
-if test "x$ac_cv_header_vapi_h" = x""yes; then :
-
-else
-  as_fn_error "Header vapi.h not found." "$LINENO" 5
+if test "x$ac_cv_header_vapi_h" = xyes; then :
+
+else
+  as_fn_error $? "Header vapi.h not found." "$LINENO" 5
 fi
 
@@ -10680 +10916 @@
                                 if test ! -f $IB_LIBDIR/libvapi.so ; then
             if test ! -f $IB_LIBDIR/libvapi.a ; then
-                as_fn_error "Infiniband library libvapi.so not found." "$LINENO" 5
+                as_fn_error $? "Infiniband library libvapi.so not found." "$LINENO" 5
             fi
         fi
@@ -10686 +10922 @@
         ac_fn_c_check_header_compile "$LINENO" "wrap_common.h" "ac_cv_header_wrap_common_h" "#include <vapi.h>
 "
-if test "x$ac_cv_header_wrap_common_h" = x""yes; then :
+if test "x$ac_cv_header_wrap_common_h" = xyes; then :
 
 $as_echo "#define HAVE_IB_WRAP_COMMON_H 1" >>confdefs.h
@@ -10704 +10940 @@
 if test "${with_openib+set}" = set; then :
   withval=$with_openib; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-openib requires the path to your OpenIB tree." "$LINENO" 5
+            as_fn_error $? "Option --with-openib requires the path to your OpenIB tree." "$LINENO" 5
         elif test "$withval" != no ; then
             openib_home="$withval"
@@ -10715 +10951 @@
 if test "${with_openib_includes+set}" = set; then :
   withval=$with_openib_includes; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-openib-includes requires path to OpenIB headers." "$LINENO" 5
+            as_fn_error $? "Option --with-openib-includes requires path to OpenIB headers." "$LINENO" 5
         elif test "$withval" != no ; then
             OPENIB_INCDIR="$withval"
@@ -10726 +10962 @@
 if test "${with_openib_libs+set}" = set; then :
   withval=$with_openib_libs; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-openib-libs requires path to OpenIB libraries." "$LINENO" 5
+            as_fn_error $? "Option --with-openib-libs requires path to OpenIB libraries." "$LINENO" 5
         elif test "$withval" != no ; then
             OPENIB_LIBDIR="$withval"
@@ -10748 +10984 @@
         CPPFLAGS="$CPPFLAGS -I$OPENIB_INCDIR"
         ac_fn_c_check_header_mongrel "$LINENO" "infiniband/verbs.h" "ac_cv_header_infiniband_verbs_h" "$ac_includes_default"
-if test "x$ac_cv_header_infiniband_verbs_h" = x""yes; then :
-
-else
-  as_fn_error "Header infiniband/verbs.h not found." "$LINENO" 5
+if test "x$ac_cv_header_infiniband_verbs_h" = xyes; then :
+
+else
+  as_fn_error $? "Header infiniband/verbs.h not found." "$LINENO" 5
 fi
 
@@ -10757 +10993 @@
                         if test ! -f $OPENIB_LIBDIR/libibverbs.so ; then
             if test ! -f $OPENIB_LIBDIR/libibverbs.a ; then
-                as_fn_error "OpenIB library libibverbs.so not found." "$LINENO" 5
+                as_fn_error $? "OpenIB library libibverbs.so not found." "$LINENO" 5
             fi
         fi
@@ -10857 +11093 @@
 if test "${with_portals_includes+set}" = set; then :
   withval=$with_portals_includes; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-portals-includes requires an argument." "$LINENO" 5
+            as_fn_error $? "Option --with-portals-includes requires an argument." "$LINENO" 5
         elif test "$withval" != no ; then
             incs="$withval"
@@ -10868 +11104 @@
 if test "${with_portals_libs+set}" = set; then :
   withval=$with_portals_libs; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-portals-libs requires an argument." "$LINENO" 5
+            as_fn_error $? "Option --with-portals-libs requires an argument." "$LINENO" 5
         elif test "$withval" != no ; then
             libs="$withval"
@@ -10926 +11162 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-            as_fn_error "Header portals/portals3.h not found." "$LINENO" 5
+            as_fn_error $? "Header portals/portals3.h not found." "$LINENO" 5
         fi
 
@@ -10998 +11234 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-            as_fn_error "Could not link Portals library." "$LINENO" 5
+            as_fn_error $? "Could not link Portals library." "$LINENO" 5
         fi
 
@@ -11007 +11243 @@
 do :
   ac_fn_c_check_func "$LINENO" "PtlErrorStr" "ac_cv_func_PtlErrorStr"
-if test "x$ac_cv_func_PtlErrorStr" = x""yes; then :
+if test "x$ac_cv_func_PtlErrorStr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTLERRORSTR 1
@@ -11018 +11254 @@
 do :
   ac_fn_c_check_func "$LINENO" "PtlEventKindStr" "ac_cv_func_PtlEventKindStr"
-if test "x$ac_cv_func_PtlEventKindStr" = x""yes; then :
+if test "x$ac_cv_func_PtlEventKindStr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTLEVENTKINDSTR 1
@@ -11060 +11296 @@
 if test "${with_zoid+set}" = set; then :
   withval=$with_zoid; if test -z "$withval" -o "$withval" = yes ; then
-            as_fn_error "Option --with-zoid requires the path to your ZOID source tree." "$LINENO" 5
+            as_fn_error $? "Option --with-zoid requires the path to your ZOID source tree." "$LINENO" 5
         elif test "$withval" != no ; then
             ZOID_SRCDIR="$withval"
@@ -11071 +11307 @@
         CPPFLAGS="$CPPFLAGS -Isrc/io/bmi -I$ZOID_SRCDIR/include -I$ZOID_SRCDIR/zbmi -I$ZOID_SRCDIR/zbmi/implementation"
         ac_fn_c_check_header_mongrel "$LINENO" "zbmi.h" "ac_cv_header_zbmi_h" "$ac_includes_default"
-if test "x$ac_cv_header_zbmi_h" = x""yes; then :
-
-else
-  as_fn_error "Header zbmi.h not found." "$LINENO" 5
+if test "x$ac_cv_header_zbmi_h" = xyes; then :
+
+else
+  as_fn_error $? "Header zbmi.h not found." "$LINENO" 5
 fi
 
 
         ac_fn_c_check_header_mongrel "$LINENO" "zoid_api.h" "ac_cv_header_zoid_api_h" "$ac_includes_default"
-if test "x$ac_cv_header_zoid_api_h" = x""yes; then :
-
-else
-  as_fn_error "Header zoid_api.h not found." "$LINENO" 5
+if test "x$ac_cv_header_zoid_api_h" = xyes; then :
+
+else
+  as_fn_error $? "Header zoid_api.h not found." "$LINENO" 5
 fi
 
 
         ac_fn_c_check_header_mongrel "$LINENO" "zbmi_protocol.h" "ac_cv_header_zbmi_protocol_h" "$ac_includes_default"
-if test "x$ac_cv_header_zbmi_protocol_h" = x""yes; then :
-
-else
-  as_fn_error "Header zbmi_protocol.h not found." "$LINENO" 5
+if test "x$ac_cv_header_zbmi_protocol_h" = xyes; then :
+
+else
+  as_fn_error $? "Header zbmi_protocol.h not found." "$LINENO" 5
 fi
 
@@ -11138 +11374 @@
 
 ac_fn_c_check_header_mongrel "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then :
+if test "x$ac_cv_header_sys_sysinfo_h" = xyes; then :
 
 $as_echo "#define HAVE_SYSINFO 1" >>confdefs.h
@@ -11150 +11386 @@
 do :
   ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-if test "x$ac_cv_func_strnlen" = x""yes; then :
+if test "x$ac_cv_func_strnlen" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRNLEN 1
@@ -11161 +11397 @@
 do :
   ac_fn_c_check_func "$LINENO" "strtoull" "ac_cv_func_strtoull"
-if test "x$ac_cv_func_strtoull" = x""yes; then :
+if test "x$ac_cv_func_strtoull" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOULL 1
@@ -11172 +11408 @@
 do :
   ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
-if test "x$ac_cv_func_strstr" = x""yes; then :
+if test "x$ac_cv_func_strstr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRSTR 1
@@ -11183 +11419 @@
 do :
   ac_fn_c_check_func "$LINENO" "fgetxattr" "ac_cv_func_fgetxattr"
-if test "x$ac_cv_func_fgetxattr" = x""yes; then :
+if test "x$ac_cv_func_fgetxattr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FGETXATTR 1
@@ -11194 +11430 @@
 do :
   ac_fn_c_check_func "$LINENO" "fsetxattr" "ac_cv_func_fsetxattr"
-if test "x$ac_cv_func_fsetxattr" = x""yes; then :
+if test "x$ac_cv_func_fsetxattr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FSETXATTR 1
@@ -11320 +11556 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getmntent" >&5
 $as_echo_n "checking for library containing getmntent... " >&6; }
-if test "${ac_cv_search_getmntent+set}" = set; then :
+if ${ac_cv_search_getmntent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -11354 +11590 @@
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_getmntent+set}" = set; then :
+  if ${ac_cv_search_getmntent+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_getmntent+set}" = set; then :
+if ${ac_cv_search_getmntent+:} false; then :
 
 else
@@ -11384 +11620 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_h" = x""yes; then :
+if test "x$ac_cv_header_malloc_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MALLOC_H 1
@@ -11396 +11632 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
-if test "x$ac_cv_header_mntent_h" = x""yes; then :
+if test "x$ac_cv_header_mntent_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MNTENT_H 1
@@ -11425 +11661 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-if test "x$ac_cv_header_execinfo_h" = x""yes; then :
+if test "x$ac_cv_header_execinfo_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_EXECINFO_H 1
@@ -11451 +11687 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "SDL_ttf.h" "ac_cv_header_SDL_ttf_h" "$ac_includes_default"
-if test "x$ac_cv_header_SDL_ttf_h" = x""yes; then :
+if test "x$ac_cv_header_SDL_ttf_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SDL_TTF_H 1
@@ -11461 +11697 @@
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL_ttf.h" "ac_cv_header_SDL_SDL_ttf_h" "$ac_includes_default"
-if test "x$ac_cv_header_SDL_SDL_ttf_h" = x""yes; then :
+if test "x$ac_cv_header_SDL_SDL_ttf_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SDL_SDL_TTF_H 1
@@ -11585 +11821 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      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
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -11604 +11851 @@
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
@@ -11620 +11868 @@
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
@@ -11721 +11969 @@
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
@@ -11766 +12015 @@
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# 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.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  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: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
@@ -11974 +12223 @@
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
@@ -12028 +12277 @@
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12090 +12339 @@
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
@@ -12109 +12358 @@
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
     ac_shift=:
     ;;
@@ -12135 +12389 @@
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -12147 +12402 @@
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
@@ -12156 +12411 @@
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
@@ -12260 +12515 @@
     "doc/doxygen/pvfs2-doxygen.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen/pvfs2-doxygen.conf" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
@@ -12282 +12537 @@
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
@@ -12292 +12548 @@
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
@@ -12314 +12571 @@
 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'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
@@ -12328 +12585 @@
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
@@ -12339 +12596 @@
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
@@ -12347 +12604 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -12395 +12652 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
@@ -12427 +12684 @@
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # 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
-  ac_vpsub='/^[  ]*VPATH[        ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[     ]*\):*/\1/
+  ac_vpsub='/^[  ]*VPATH[        ]*=[    ]*/{
+h
+s///
+s/^/:/
+s/[      ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[   ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[       ]*$//
 }'
@@ -12453 +12718 @@
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
@@ -12465 +12730 @@
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
@@ -12554 +12819 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
@@ -12567 +12832 @@
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -12586 +12851 @@
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # 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,
@@ -12595 +12860 @@
            *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
            esac ||
-           as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
@@ -12621 +12886 @@
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
@@ -12752 +13017 @@
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+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
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { 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
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
@@ -12777 +13043 @@
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && 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
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-        || as_fn_error "could not create $ac_file" "$LINENO" 5
+      mv "$ac_tmp/config.h" "$ac_file" \
+        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
@@ -12806 +13072 @@
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
@@ -12827 +13093 @@
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

branches/Orange-Branch/maint/config/kernel.m4

@@ -16 +16 @@
         NOSTDINCFLAGS="-Werror-implicit-function-declaration -nostdinc -isystem `$CC -print-file-name=include`"
 
-        CFLAGS="$USR_CFLAGS $NOSTDINCFLAGS -I$lk_src/include -I$lk_src/include/asm/mach-default -DKBUILD_STR(s)=#s -DKBUILD_BASENAME=KBUILD_STR(empty)  -DKBUILD_MODNAME=KBUILD_STR(empty)"
+        dnl add optimizations to the flags. for some reason rcupdate.h in 
+        dnl 2.6.40 causes compilation failures when no optimzation is used. 
+        dnl no clear answer why this is.
+        CFLAGS="-O2 $USR_CFLAGS $NOSTDINCFLAGS -I$lk_src/include -I$lk_src/include/asm/mach-default -DKBUILD_STR(s)=#s -DKBUILD_BASENAME=KBUILD_STR(empty)  -DKBUILD_MODNAME=KBUILD_STR(empty)"
 
         dnl kernels > 2.6.32 now use generated/autoconf.h
@@ -517 +520 @@
                 AC_MSG_RESULT(yes)
                 AC_DEFINE(HAVE_VFSMOUNT_GETSB, 1, Define if file_system_type get_sb has vfsmount argument),
+                AC_MSG_RESULT(no)
+        )
+
+        AC_MSG_CHECKING(for get_sb_nodev)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                int v_fill_sb(struct super_block *sb, void *data, int s)
+                {
+                        return 0;
+                }
+                ],
+                [
+                        int ret = 0;
+                        struct super_block *sb = NULL;
+#ifdef HAVE_VFSMOUNT_GETSB
+                        ret = get_sb_nodev(NULL, 0, NULL, v_fill_sb, NULL );
+#else
+                        sb = get_sb_nodev(NULL, 0, NULL, v_fill_sb);
+#endif
+                ], 
+                AC_MSG_RESULT(yes)
+                AC_DEFINE(HAVE_GETSB_NODEV, 1, Define if get_sb_nodev function exists ),
+                AC_MSG_RESULT(no)
+        )
+
+        AC_MSG_CHECKING(for file_system_type get_sb)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                ],
+                [
+                    struct file_system_type f;
+                    f.get_sb = NULL;
+                ], 
+                AC_MSG_RESULT(yes)
+                AC_DEFINE(HAVE_FSTYPE_GET_SB, 1, Define if only filesystem_type has get_sb),
+                AC_MSG_RESULT(no)
+        )
+
+
+
+        AC_MSG_CHECKING(for file_system_type mount exclusively)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                ],
+                [
+#ifdef HAVE_FSTYPE_GET_SB
+                    assert(0);
+#else
+                    struct file_system_type f;
+                    f.mount = NULL;
+#endif
+                ], 
+                AC_MSG_RESULT(yes)
+                AC_DEFINE(HAVE_FSTYPE_MOUNT_ONLY, 1, Define if only filesystem_type has mount and HAVE_FSTYPE_GET_SB is false),
                 AC_MSG_RESULT(no)
         )
@@ -672 +732 @@
                 ])
 
+        dnl no bkl, no need for smp_lock.h
+        AC_CHECK_HEADER([linux/smp_lock.h], [], [],
+                [#define __KERNEL__
+                 #include <linux/smp_lock.h>
+                ])
+
         AC_MSG_CHECKING(for generic_file_readv api in kernel)
         dnl if this test passes, the kernel does not have it
@@ -1634 +1700 @@
         CFLAGS=$tmp_cflags
 
+        dnl SPIN_LOCK_UNLOCKED has gone away in 2.6.39 in lieu of 
+        dnl DEFINE_SPINLOCK()
+        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        AC_MSG_CHECKING(for SPIN_LOCK_UNLOCKED )
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/spinlock.h>
+                spinlock_t test_lock = SPIN_LOCK_UNLOCKED;
+                struct inode *i;
+        ], [ ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_SPIN_LOCK_UNLOCKED, 1, [Define if SPIN_LOCK_UNLOCKED defined]),
+        AC_MSG_RESULT(no)
+        )
+        CFLAGS=$tmp_cflags
+
+        dnl get_sb goes away in 2.6.39 for mount_X
+        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        AC_MSG_CHECKING(for get_sb )
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                struct file_system_type f;
+        ], 
+        [
+                f.get_sb = NULL;
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_GET_SB_MEMBER_FILE_SYSTEM_TYPE, 1, [Define if get_sb is a member of file_system_type struct]),
+        AC_MSG_RESULT(no)
+        )
+
+        AC_MSG_CHECKING(for dirty_inode flag)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                void di(struct inode *i, int f)
+                {
+                        return;
+                }
+                ],
+                [
+                        struct super_operations s;
+                        s.dirty_inode = di;
+                ], 
+                AC_MSG_RESULT(yes)
+                AC_DEFINE(HAVE_DIRTY_INODE_FLAGS, 1, Define if dirty_inode takes a flag argument ),
+                AC_MSG_RESULT(no)
+        )
+        CFLAGS=$tmp_cflags
 
         CFLAGS=$oldcflags

branches/Orange-Branch/pvfs2-config.h.in

@@ -80 +80 @@
 #undef HAVE_DENTRY_STATFS_SOP
 
+/* Define if dirty_inode takes a flag argument */
+#undef HAVE_DIRTY_INODE_FLAGS
+
 /* Define if kernel super_operations contains drop_inode field */
 #undef HAVE_DROP_INODE
@@ -126 +129 @@
 #undef HAVE_FSTAB_H
 
+/* Define if only filesystem_type has get_sb */
+#undef HAVE_FSTYPE_GET_SB
+
+/* Define if only filesystem_type has mount and HAVE_FSTYPE_GET_SB is false */
+#undef HAVE_FSTYPE_MOUNT_ONLY
+
 /* Define if fsync function in file_operations struct wants a dentry pointer
    as the second parameter */
@@ -154 +163 @@
 #undef HAVE_GETPWUID
 
+/* Define if get_sb_nodev function exists */
+#undef HAVE_GETSB_NODEV
+
 /* Define if struct super_operations in kernel has get_fs_key callback */
 #undef HAVE_GET_FS_KEY_SUPER_OPERATIONS
+
+/* Define if get_sb is a member of file_system_type struct */
+#undef HAVE_GET_SB_MEMBER_FILE_SYSTEM_TYPE
 
 /* Define if strerror_r is GNU-specific */
@@ -367 +382 @@
    tree_lock */
 #undef HAVE_SPIN_LOCK_TREE_ADDR_SPACE_STRUCT
+
+/* Define if SPIN_LOCK_UNLOCKED defined */
+#undef HAVE_SPIN_LOCK_UNLOCKED
 
 /* Define if struct super_operations in kernel has statfs_lite callback */

branches/Orange-Branch/src/kernel/linux-2.6/pvfs2-bufmap.c

@@ -30 +30 @@
 /* array to track usage of buffer descriptors */
 static int *buffer_index_array = NULL;
+#ifdef HAVE_SPIN_LOCK_UNLOCKED
 static spinlock_t buffer_index_lock = SPIN_LOCK_UNLOCKED;
+#else
+static DEFINE_SPINLOCK(buffer_index_lock);
+#endif /* HAVE_SPIN_LOCK_UNLOCKED */
 
 /* array to track usage of buffer descriptors for readdir/readdirplus */
 static int readdir_index_array[PVFS2_READDIR_DEFAULT_DESC_COUNT] = {0};
+#ifdef HAVE_SPIN_LOCK_UNLOCKED
 static spinlock_t readdir_index_lock = SPIN_LOCK_UNLOCKED;
+#else
+static DEFINE_SPINLOCK(readdir_index_lock);
+#endif /* HAVE_SPIN_LOCK_UNLOCKED */
 
 static struct pvfs_bufmap_desc *desc_array = NULL;

branches/Orange-Branch/src/kernel/linux-2.6/pvfs2-cache.c

@@ -8 +8 @@
 
 /* A list of all allocated pvfs2 inode objects */
+#ifdef HAVE_SPIN_LOCK_UNLOCKED
 static spinlock_t pvfs2_inode_list_lock = SPIN_LOCK_UNLOCKED;
+#else
+static DEFINE_SPINLOCK(pvfs2_inode_list_lock);
+#endif /* HAVE_SPIN_LOCK_UNLOCKED */
+
 static LIST_HEAD(pvfs2_inode_list);
 
 /* tags assigned to kernel upcall operations */
 static uint64_t next_tag_value;
+#ifdef HAVE_SPIN_LOCK_UNLOCKED
 static spinlock_t next_tag_value_lock = SPIN_LOCK_UNLOCKED;
-
+#else
+static DEFINE_SPINLOCK(next_tag_value_lock);
+#endif /* HAVE_SPIN_LOCK_UNLOCKED */
 /* the pvfs2 memory caches */
 

branches/Orange-Branch/src/kernel/linux-2.6/pvfs2-kernel.h

@@ -24 +24 @@
 #include <linux/config.h>
 #endif
+#include <linux/kernel.h>
 
 #ifdef PVFS2_LINUX_KERNEL_2_4
@@ -42 +43 @@
 
 #else /* !(PVFS2_LINUX_KERNEL_2_4) */
-
 #include <linux/moduleparam.h>
 #include <linux/vermagic.h>
@@ -55 +55 @@
 #endif /* PVFS2_LINUX_KERNEL_2_4 */
 
-#include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -94 +93 @@
 #include <linux/mm.h>
 #include <asm/atomic.h>
+#ifdef HAVE_SMP_LOCK_H
 #include <linux/smp_lock.h>
+#endif
 #include <linux/wait.h>
 #include <linux/dcache.h>
@@ -776 +777 @@
     int silent);
 #else
+#ifdef HAVE_FSTYPE_MOUNT_ONLY
+struct dentry *pvfs2_mount(
+    struct file_system_type *fst, int flags,
+    const char *devname, void *data);
+#else
 #ifdef HAVE_VFSMOUNT_GETSB
 int pvfs2_get_sb(
@@ -785 +791 @@
     struct file_system_type *fst, int flags,
     const char *devname, void *data);
-#endif
+#endif /* HAVE_VFSMOUNT_GETSB */
+#endif /* HAVE_FSTYPE_MOUNT_ONLY */
 #endif
 

branches/Orange-Branch/src/kernel/linux-2.6/pvfs2-mod.c

@@ -84 +84 @@
 {
     .name = "pvfs2",
+/* only define mount if the kernel no longer supports get_sb */
+#ifdef HAVE_FSTYPE_MOUNT_ONLY
+    .mount = pvfs2_mount,
+#else
     .get_sb = pvfs2_get_sb,
+#endif /* HAVE_FSTYPE_MOUNT_ONLY */
     .kill_sb = pvfs2_kill_sb,
     .owner = THIS_MODULE,
@@ -121 +126 @@
 
 /* used to protect the above pvfs2_request_list */
+#ifdef HAVE_SPIN_LOCK_UNLOCKED
 spinlock_t pvfs2_request_list_lock = SPIN_LOCK_UNLOCKED;
+#else 
+DEFINE_SPINLOCK(pvfs2_request_list_lock);
+#endif /* HAVE_SPIN_LOCK_UNLOCKED */
 
 /* used for incoming request notification */

branches/Orange-Branch/src/kernel/linux-2.6/super.c

@@ -13 +13 @@
 
 /* used to protect the above superblock list */
+#ifdef HAVE_SPIN_LOCK_UNLOCKED
 spinlock_t pvfs2_superblocks_lock = SPIN_LOCK_UNLOCKED;
+#else
+DEFINE_SPINLOCK(pvfs2_superblocks_lock);
+#endif /* HAVE_SPIN_LOCK_UNLOCKED */
 
 #ifdef HAVE_GET_FS_KEY_SUPER_OPERATIONS
@@ -890 +894 @@
 
 /* Called whenever the VFS dirties the inode in response to atime updates */
-static void pvfs2_dirty_inode(struct inode *inode)
+static void pvfs2_dirty_inode(struct inode *inode
+#ifdef HAVE_DIRTY_INODE_FLAGS
+                              ,int flags
+#endif
+                             )
 {
     if (inode)
@@ -1289 +1297 @@
     return 0;
 }
-
+#ifdef HAVE_FSTYPE_MOUNT_ONLY
+struct dentry *pvfs2_mount(
+    struct file_system_type *fst,
+    int flags,
+    const char *devname,
+    void *data)
+#else
 #ifdef HAVE_VFSMOUNT_GETSB
 int pvfs2_get_sb(
@@ -1303 +1317 @@
     const char *devname,
     void *data)
-#endif
+#endif /* HAVE_VFSMOUNT_GETSB */
+#endif /* HAVE_FSTYPE_MOUNT_ONLY */
 {
     int ret = -EINVAL;
@@ -1309 +1324 @@
     pvfs2_kernel_op_t *new_op;
     pvfs2_mount_sb_info_t mount_sb_info;
+#ifdef HAVE_FSTYPE_MOUNT_ONLY
+    struct dentry *mnt_sb_d = ERR_PTR(-EINVAL);
+#endif
 
     gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_get_sb: called with devname %s\n", devname);
@@ -1318 +1336 @@
         {
             ret = -ENOMEM;
-#ifdef HAVE_VFSMOUNT_GETSB
+#if defined(HAVE_VFSMOUNT_GETSB) && !defined(HAVE_FSTYPE_MOUNT_ONLY)
             return ret;
 #else
@@ -1361 +1379 @@
           to fill_sb where it's properly copied out
         */
+        /* kernels beyond 2.6.38 no longer have get_sb_nodev in favor of
+         * mount_nodev. if the kernel still has get_sb_nodev use that in
+         * favor of mount_nodev to minimize changes for currently working
+         * kernels. */
+#ifdef HAVE_GETSB_NODEV
 #ifdef HAVE_VFSMOUNT_GETSB
         ret = get_sb_nodev(
@@ -1370 +1393 @@
         sb = get_sb_nodev(
             fst, flags, (void *)&mount_sb_info, pvfs2_fill_sb);
-#endif
+#endif /* HAVE_VFSMOUNT_GETSB */
+#else /* !HAVE_GETSB_NODEV */
+        mnt_sb_d = mount_nodev(
+                    fst, flags, (void *)&mount_sb_info, pvfs2_fill_sb);
+        if( !IS_ERR(mnt_sb_d) )
+        {
+            sb = mnt_sb_d->d_sb;
+        }
+        else
+        {
+            sb = ERR_CAST(mnt_sb_d);
+            goto free_op;
+        }
+#endif /* HAVE_GETSB_NODEV */
 
         if (sb && !IS_ERR(sb) && (PVFS2_SB(sb)))
@@ -1409 +1445 @@
         gossip_err("ERROR: device name not specified.\n");
     }
-
+#ifdef HAVE_FSTYPE_MOUNT_ONLY
+    return mnt_sb_d;
+#else
 #ifdef HAVE_VFSMOUNT_GETSB
     return ret;
 #else
     return sb;
-#endif
+#endif /* HAVE_VFSMOUNT_GETSB */
+#endif /* HAVE_FSTYPE_MOUNT_ONLY */
 
 error_exit:
     if (ret || IS_ERR(sb))
     {
+#if !defined(HAVE_FSTYPE_MOUNT_ONLY)
         sb = ERR_PTR(ret);
+#endif /* HAVE_FSTYPE_MOUNT_ONLY */
     }
 #ifdef HAVE_VFSMOUNT_GETSB
@@ -1435 +1476 @@
         op_release(new_op);
     }
-#ifdef HAVE_VFSMOUNT_GETSB
+#if defined(HAVE_VFSMOUNT_GETSB) && !defined(HAVE_FSTYPE_MOUNT_ONLY)
     gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_get_sb: returning %d\n", ret);
     return ret;
+#elif defined(HAVE_FSTYPE_MOUNT_ONLY)
+    gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_get_sb: returning dentry %p\n", 
+        mnt_sb_d);
+    return mnt_sb_d;
 #else
     gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_get_sb: returning sb %p\n", sb);