diff --git a/Makefile.in b/Makefile.in
index dfbe97f5b..805e3a61c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,6 +44,7 @@ SITE_MSG_FILE             := @SITE_MSG_FILE@
 SITE_NAME                 := @SITE_NAME@
 SUPPORT_KSH               := @SUPPORT_KSH@
 SYSHOST                   := @SYSHOST@
+DYNAMIC_SPIDER_CACHE      := @DYNAMIC_SPIDER_CACHE@
 SILENCE_SHELL_DEBUGGING   := @SILENCE_SHELL_DEBUGGING@
 SYS_LD_LIB_PATH           := @SYS_LD_LIB_PATH@
 SYS_LD_PRELOAD            := @SYS_LD_PRELOAD@
@@ -263,6 +264,7 @@ __installMe:
 	        -e 's|@path_to_lmod@|$(LIBEXEC)/lmod|g'                           \
 	        -e 's|@have_lua_term@|$(HAVE_LUA_TERM)|g'                         \
 	        -e 's|@silence_shell_debugging@|$(SILENCE_SHELL_DEBUGGING)|g'     \
+	        -e 's|@dynamic_spider_cache@|$(DYNAMIC_SPIDER_CACHE)|g'           \
 	        -e 's|@fast_tcl_interp@|$(FAST_TCL_INTERP)|g'                     \
 	        -e 's|@settarg_cmd@|$(SETTARG_CMD)|g'                             \
 	        -e 's|@lmod_config_dir@|$(LMOD_CONFIG_DIR)|g'                     \
diff --git a/README.new b/README.new
index e6b977ad0..72ee0563e 100644
--- a/README.new
+++ b/README.new
@@ -6,6 +6,10 @@ Lmod 8.7+
               with "#%Module" is ignored.
 	    * Report an Infinite loop error if loading the same modulefile 500 times.
 	    * Add note to 095_tcl2lua.tcl about the whole TCL modulefile being evaluated by TCL.
-	      Note also that this is not a SOURCE-to-SOURCE translation.
+	      Note also that this is not a SOURCE-to-SOURCE translation from TCL to Lua.
 	    * Cannot use local with KSH
 	    * Only add to mpathMapT when mpath_old ~= mpath_new in l_processNewModulePath(path).
+W.I.P:
+   (8.7.4)  * Issue #578: Dynamic Spider Cache supported. 
+            * Change Regular files counter to ignore files that start with "."
+            
diff --git a/aclocal.m4 b/aclocal.m4
index 9dd96db2f..7ca5e48cc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -75,6 +75,7 @@ echo "Support KSH................................................." : $SUPPORT_K
 echo "Use the fast TCL interpreter................................" : $FAST_TCL_INTERP
 echo "LMOD_CONFIG_DIR............................................." : $LMOD_CONFIG_DIR
 echo "Display Extensions w/ module avail.........................." : $AVAIL_EXTENSIONS
+echo "Dynamic Spider Cache support................................" : $DYNAMIC_SPIDER_CACHE
 echo "Allow for extended default.(ml intel/17 #-> intel/17.0.4)..." : $EXTENDED_DEFAULT  #"
 
 echo
diff --git a/configure b/configure
index 141c901c6..4554bad20 100755
--- a/configure
+++ b/configure
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71.
+# Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -15,16 +14,14 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else $as_nop
+else
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -34,46 +31,46 @@ esac
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -82,6 +79,13 @@ if ${PATH_SEPARATOR+false} :; then
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -90,12 +94,8 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
@@ -107,10 +107,30 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -132,22 +152,20 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="as_nop=:
-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else \$as_nop
+else
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -167,52 +185,42 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" )
-then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
-else \$as_nop
+else
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
-blah=\$(echo \$(echo blah))
-test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
-  if (eval "$as_required") 2>/dev/null
-then :
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
-else $as_nop
+else
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
-then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-else $as_nop
+else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir$as_base
+	     as_shell=$as_dir/$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
-then :
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
   break 2
 fi
 fi
@@ -220,21 +228,14 @@ fi
        esac
   as_found=false
 done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else $as_nop
-  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
   CONFIG_SHELL=$SHELL as_have_required=yes
-fi
-fi
+fi; }
+IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x
-then :
+      if test "x$CONFIG_SHELL" != x; then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -252,19 +253,18 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno
-then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
-  if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -291,7 +291,6 @@ as_fn_unset ()
 }
 as_unset=as_fn_unset
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -309,14 +308,6 @@ as_fn_exit ()
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -331,7 +322,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -340,7 +331,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -379,13 +370,12 @@ as_fn_executable_p ()
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else $as_nop
+else
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -397,27 +387,18 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else $as_nop
+else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -429,9 +410,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -458,7 +439,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -502,7 +483,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -516,10 +497,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -533,13 +510,6 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -605,47 +575,51 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=''
-PACKAGE_TARNAME=''
-PACKAGE_VERSION=''
-PACKAGE_STRING=''
-PACKAGE_BUGREPORT=''
-PACKAGE_URL=''
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 ac_unique_file="Makefile.in"
 ac_default_prefix=/usr/local
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stddef.h>
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
 #endif
-#ifdef HAVE_STDLIB_H
+#ifdef STDC_HEADERS
 # include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
 #endif
 #ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
 # include <string.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 ZSH
@@ -671,6 +645,9 @@ SYS_LD_PRELOAD
 SYS_LD_LIB_PATH
 TCL_LIBS
 TCL_INCLUDE
+EGREP
+GREP
+CPP
 pkgConfig
 LUA_SUFFIX
 PATH_TO_LUAC
@@ -709,6 +686,7 @@ AUTO_SWAP
 LMOD_CONFIG_DIR
 EXACT_MATCH
 HIDDEN_ITALIC
+DYNAMIC_SPIDER_CACHE
 COLORIZE
 CASE_INDEPENDENT_SORTING
 LMOD_OVERRIDE_LANG
@@ -770,6 +748,7 @@ with_siteMsgFile
 with_lang
 with_caseIndependentSorting
 with_colorize
+with_dynamicSpiderCache
 with_hiddenItalic
 with_exactMatch
 with_lmodConfigDir
@@ -815,7 +794,8 @@ CC
 CFLAGS
 LDFLAGS
 LIBS
-CPPFLAGS'
+CPPFLAGS
+CPP'
 
 
 # Initialize some variables set by options.
@@ -884,6 +864,8 @@ do
   *)    ac_optarg=yes ;;
   esac
 
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -924,9 +906,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -950,9 +932,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1163,9 +1145,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1179,9 +1161,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1225,9 +1207,9 @@ Try \`$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1243,7 +1225,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1307,7 +1289,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1442,6 +1424,8 @@ Optional Packages:
                           Make avail and spider use case independent sorting
                           [[no]]
   --with-colorize=ans     allow for colorized output [[yes]]
+  --with-dynamicSpiderCache=ans
+                          allow for Dynamic Spider Cache usage [[yes]]
   --with-hiddenItalic=ans Use italic for hidden module instead of faint[[no]]
   --with-exactMatch=ans   require exact match, disable defaults [[no]]
   --with-lmodConfigDir=ans
@@ -1519,6 +1503,7 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1539,9 +1524,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1569,8 +1554,7 @@ esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for configure.gnu first; this name is used for a wrapper for
-    # Metaconfig's "Configure" on case-insensitive file systems.
+    # Check for guested configure.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1578,7 +1562,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1588,9 +1572,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.71
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1607,14 +1591,14 @@ fi
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam
+  rm -f conftest.$ac_objext
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1622,15 +1606,14 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
+       } && test -s conftest.$ac_objext; then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1640,6 +1623,172 @@ fi
 
 } # ac_fn_c_try_compile
 
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -1647,28 +1796,26 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
-else $as_nop
+else
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -1679,14 +1826,14 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1694,18 +1841,17 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }
-then :
+       }; then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1719,34 +1865,14 @@ fi
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
-ac_configure_args_raw=
-for ac_arg
-do
-  case $ac_arg in
-  *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  as_fn_append ac_configure_args_raw " '$ac_arg'"
-done
-
-case $ac_configure_args_raw in
-  *$as_nl*)
-    ac_safe_unquote= ;;
-  *)
-    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
-    ac_unsafe_a="$ac_unsafe_z#~"
-    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
-esac
-
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ $0$ac_configure_args_raw
+  $ $0 $@
 
 _ACEOF
 exec 5>>config.log
@@ -1779,12 +1905,8 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    printf "%s\n" "PATH: $as_dir"
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -1819,7 +1941,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1854,13 +1976,11 @@ done
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    printf "%s\n" "## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -1871,8 +1991,8 @@ trap 'exit_status=$?
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -1896,7 +2016,7 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 )
     echo
 
-    printf "%s\n" "## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -1904,14 +2024,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -1919,15 +2039,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -1935,8 +2055,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       echo
     fi
     test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1950,48 +2070,63 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_files="$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_files="$prefix/share/config.site $prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-
-for ac_site_file in $ac_site_files
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
-  case $ac_site_file in #(
-  */*) :
-     ;; #(
-  *) :
-    ac_site_file=./$ac_site_file ;;
-esac
-  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { $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
@@ -2001,412 +2136,85 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-# Test code for whether the C compiler supports C89 (global declarations)
-ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
-
-#include <stddef.h>
-#include <stdarg.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
-struct buf { int x; };
-struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not \xHH hex character constants.
-   These do not provoke an error unfortunately, instead are silently treated
-   as an "x".  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
-   array size at least.  It is necessary to write \x00 == 0 to get something
-   that is true only with -std.  */
-int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) '\''x'\''
-int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
-               int, int);'
-
-# Test code for whether the C compiler supports C89 (body of main).
-ac_c_conftest_c89_main='
-ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
-'
-
-# Test code for whether the C compiler supports C99 (global declarations)
-ac_c_conftest_c99_globals='
-// Does the compiler advertise C99 conformance?
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
-# error "Compiler does not advertise C99 conformance"
-#endif
-
-#include <stdbool.h>
-extern int puts (const char *);
-extern int printf (const char *, ...);
-extern int dprintf (int, const char *, ...);
-extern void *malloc (size_t);
-
-// Check varargs macros.  These examples are taken from C99 6.10.3.5.
-// dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
-#define debug(...) dprintf (2, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
-  int x = 1234;
-  int y = 5678;
-  debug ("Flag");
-  debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
-  report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
-  #error "your preprocessor is broken"
-#endif
-#if BIG_OK
-#else
-  #error "your preprocessor is broken"
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
-  int datasize;
-  double data[];
-};
-
-struct named_init {
-  int number;
-  const wchar_t *name;
-  double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
-  // See if C++-style comments work.
-  // Iterate through items via the restricted pointer.
-  // Also check for declarations in for loops.
-  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
-    continue;
-  return 0;
-}
-
-// Check varargs and va_copy.
-static bool
-test_varargs (const char *format, ...)
-{
-  va_list args;
-  va_start (args, format);
-  va_list args_copy;
-  va_copy (args_copy, args);
-
-  const char *str = "";
-  int number = 0;
-  float fnumber = 0;
-
-  while (*format)
-    {
-      switch (*format++)
-	{
-	case '\''s'\'': // string
-	  str = va_arg (args_copy, const char *);
-	  break;
-	case '\''d'\'': // int
-	  number = va_arg (args_copy, int);
-	  break;
-	case '\''f'\'': // float
-	  fnumber = va_arg (args_copy, double);
-	  break;
-	default:
-	  break;
-	}
-    }
-  va_end (args_copy);
-  va_end (args);
-
-  return *str && number && fnumber;
-}
-'
-
-# Test code for whether the C compiler supports C99 (body of main).
-ac_c_conftest_c99_main='
-  // Check bool.
-  _Bool success = false;
-  success |= (argc != 0);
-
-  // Check restrict.
-  if (test_restrict ("String literal") == 0)
-    success = true;
-  char *restrict newvar = "Another string";
-
-  // Check varargs.
-  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
-  test_varargs_macros ();
-
-  // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
-  ia->datasize = 10;
-  for (int i = 0; i < ia->datasize; ++i)
-    ia->data[i] = i * 1.234;
-
-  // Check named initializers.
-  struct named_init ni = {
-    .number = 34,
-    .name = L"Test wide string",
-    .average = 543.34343,
-  };
-
-  ni.number = 58;
-
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
-
-  // work around unused variable warnings
-  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
-'
-
-# Test code for whether the C compiler supports C11 (global declarations)
-ac_c_conftest_c11_globals='
-// Does the compiler advertise C11 conformance?
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
-# error "Compiler does not advertise C11 conformance"
-#endif
-
-// Check _Alignas.
-char _Alignas (double) aligned_as_double;
-char _Alignas (0) no_special_alignment;
-extern char aligned_as_int;
-char _Alignas (0) _Alignas (int) aligned_as_int;
-
-// Check _Alignof.
-enum
-{
-  int_alignment = _Alignof (int),
-  int_array_alignment = _Alignof (int[100]),
-  char_alignment = _Alignof (char)
-};
-_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
-
-// Check _Noreturn.
-int _Noreturn does_not_return (void) { for (;;) continue; }
-
-// Check _Static_assert.
-struct test_static_assert
-{
-  int x;
-  _Static_assert (sizeof (int) <= sizeof (long int),
-                  "_Static_assert does not work in struct");
-  long int y;
-};
-
-// Check UTF-8 literals.
-#define u8 syntax error!
-char const utf8_literal[] = u8"happens to be ASCII" "another string";
-
-// Check duplicate typedefs.
-typedef long *long_ptr;
-typedef long int *long_ptr;
-typedef long_ptr long_ptr;
-
-// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
-struct anonymous
-{
-  union {
-    struct { int i; int j; };
-    struct { int k; long int l; } w;
-  };
-  int m;
-} v1;
-'
-
-# Test code for whether the C compiler supports C11 (body of main).
-ac_c_conftest_c11_main='
-  _Static_assert ((offsetof (struct anonymous, i)
-		   == offsetof (struct anonymous, w.k)),
-		  "Anonymous union alignment botch");
-  v1.i = 2;
-  v1.w.k = 5;
-  ok |= v1.i != 5;
-'
-
-# Test code for whether the C compiler supports C11 (complete).
-ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-${ac_c_conftest_c11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  ${ac_c_conftest_c11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C99 (complete).
-ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C89 (complete).
-ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  return ok;
-}
-"
-
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
-as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
-as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
-as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
-as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
-as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
-as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
-as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
-as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
-	    and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $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
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -2418,12 +2226,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2431,15 +2238,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2450,11 +2253,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2463,12 +2266,11 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -2476,15 +2278,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2495,11 +2293,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2507,8 +2305,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2521,12 +2319,11 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2534,15 +2331,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2553,11 +2346,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2566,12 +2359,11 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2580,19 +2372,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2608,18 +2396,18 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2630,12 +2418,11 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2643,15 +2430,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2662,11 +2445,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2679,12 +2462,11 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -2692,15 +2474,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2711,11 +2489,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2727,8 +2505,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2736,129 +2514,25 @@ esac
 fi
 
 fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
-set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "clang", so it can be a program name with args.
-set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="clang"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
 
-
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+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; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion -version; do
+for ac_option in --version -v -V -qversion; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2868,7 +2542,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -2876,7 +2550,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -2888,9 +2562,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -2911,12 +2585,11 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -2933,7 +2606,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -2949,46 +2622,44 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else $as_nop
+else
   ac_file=''
 fi
-if test -z "$ac_file"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-printf %s "checking for suffix of executables... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3002,15 +2673,15 @@ for ac_file in conftest.exe conftest conftest.*; do
     * ) break;;
   esac
 done
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3019,7 +2690,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main (void)
+main ()
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -3031,8 +2702,8 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-printf %s "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3040,10 +2711,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -3051,40 +2722,39 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot run C compiled programs.
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-printf %s "checking for suffix of object files... " >&6; }
-if test ${ac_cv_objext+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $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 ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -3098,12 +2768,11 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3112,32 +2781,31 @@ then :
        break;;
   esac
 done
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $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; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
-printf %s "checking whether the compiler supports GNU C... " >&6; }
-if test ${ac_cv_c_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $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 ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -3147,33 +2815,29 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else $as_nop
+else
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+y}
+ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-printf %s "checking whether $CC accepts -g... " >&6; }
-if test ${ac_cv_prog_cc_g+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -3182,60 +2846,57 @@ else $as_nop
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else $as_nop
+else
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else $as_nop
+else
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
-if test $ac_test_CFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -3250,144 +2911,94 @@ else
     CFLAGS=
   fi
 fi
-ac_prog_cc_stdc=no
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
-printf %s "checking for $CC option to enable C11 features... " >&6; }
-if test ${ac_cv_prog_cc_c11+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c11=no
+{ $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 ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c11_program
-_ACEOF
-for ac_arg in '' -std=gnu11
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
 
-if test "x$ac_cv_prog_cc_c11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
-printf %s "checking for $CC option to enable C99 features... " >&6; }
-if test ${ac_cv_prog_cc_c99+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c99_program
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c99=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
-if test "x$ac_cv_prog_cc_c99" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c99" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
-printf %s "checking for $CC option to enable C89 features... " >&6; }
-if test ${ac_cv_prog_cc_c89+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c89_program
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
+rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-fi
 
-if test "x$ac_cv_prog_cc_c89" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c89" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89"
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89
 fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
 fi
 
 ac_ext=c
@@ -3437,523 +3048,625 @@ FOLLOW_READLINK ()
 
 
 # Check whether --with-duplicatePaths was given.
-if test ${with_duplicatePaths+y}
-then :
+if test "${with_duplicatePaths+set}" = set; then :
   withval=$with_duplicatePaths; DUPLICATE_PATHS="$withval"
     DUPLICATE_PATHS=`echo $DUPLICATE_PATHS | tr '[:upper:]' '[:lower:]'`
     VALID_YN $DUPLICATE_PATHS "--with-duplicatePaths=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$with_duplicatePaths" >&5
-printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; }
-    printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$with_duplicatePaths" >&5
+$as_echo "DUPLICATE_PATHS=$with_duplicatePaths" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define DUPLICATE_PATHS "$with_duplicatePaths"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5
-printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5
+$as_echo "DUPLICATE_PATHS=$withval" >&6; }
     DUPLICATE_PATHS="$withval"
-    printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define DUPLICATE_PATHS "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-allowRootUse was given.
-if test ${with_allowRootUse+y}
-then :
+if test "${with_allowRootUse+set}" = set; then :
   withval=$with_allowRootUse; LMOD_ALLOW_ROOT_USE="$withval"
     LMOD_ALLOW_ROOT_USE=`echo $LMOD_ALLOW_ROOT_USE | tr '[:upper:]' '[:lower:]'`
     VALID_YN $LMOD_ALLOW_ROOT_USE "--with-allowRootUse=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&5
-printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; }
-    printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&5
+$as_echo "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define LMOD_ALLOW_ROOT_USE "$with_allowRootUse"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5
-printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5
+$as_echo "LMOD_ALLOW_ROOT_USE=$withval" >&6; }
     LMOD_ALLOW_ROOT_USE="$withval"
-    printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define LMOD_ALLOW_ROOT_USE "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-siteMsgFile was given.
-if test ${with_siteMsgFile+y}
-then :
+if test "${with_siteMsgFile+set}" = set; then :
   withval=$with_siteMsgFile; SITE_MSG_FILE="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$with_siteMsgFile" >&5
-printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; }
-    printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$with_siteMsgFile" >&5
+$as_echo "SITE_MSG_FILE=$with_siteMsgFile" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SITE_MSG_FILE "$with_siteMsgFile"
+_ACEOF
 
-else $as_nop
+else
   withval="<empty>"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5
-printf "%s\n" "SITE_MSG_FILE=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5
+$as_echo "SITE_MSG_FILE=$withval" >&6; }
     SITE_MSG_FILE="$withval"
-    printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SITE_MSG_FILE "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-lang was given.
-if test ${with_lang+y}
-then :
+if test "${with_lang+set}" = set; then :
   withval=$with_lang; LMOD_OVERRIDE_LANG="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$with_lang" >&5
-printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; }
-    printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$with_lang" >&5
+$as_echo "LMOD_OVERRIDE_LANG=$with_lang" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define LMOD_OVERRIDE_LANG "$with_lang"
+_ACEOF
 
-else $as_nop
+else
   withval="<empty>"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5
-printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5
+$as_echo "LMOD_OVERRIDE_LANG=$withval" >&6; }
     LMOD_OVERRIDE_LANG="$withval"
-    printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define LMOD_OVERRIDE_LANG "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-caseIndependentSorting was given.
-if test ${with_caseIndependentSorting+y}
-then :
+if test "${with_caseIndependentSorting+set}" = set; then :
   withval=$with_caseIndependentSorting; CASE_INDEPENDENT_SORTING="$withval"
     CASE_INDEPENDENT_SORTING=`echo $CASE_INDEPENDENT_SORTING | tr '[:upper:]' '[:lower:]'`
     VALID_YN $CASE_INDEPENDENT_SORTING "--with-caseIndependentSorting=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&5
-printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; }
-    printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&5
+$as_echo "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define CASE_INDEPENDENT_SORTING "$with_caseIndependentSorting"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5
-printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5
+$as_echo "CASE_INDEPENDENT_SORTING=$withval" >&6; }
     CASE_INDEPENDENT_SORTING="$withval"
-    printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define CASE_INDEPENDENT_SORTING "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-colorize was given.
-if test ${with_colorize+y}
-then :
+if test "${with_colorize+set}" = set; then :
   withval=$with_colorize; COLORIZE="$withval"
     COLORIZE=`echo $COLORIZE | tr '[:upper:]' '[:lower:]'`
     VALID_YN $COLORIZE "--with-colorize=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$with_colorize" >&5
-printf "%s\n" "COLORIZE=$with_colorize" >&6; }
-    printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$with_colorize" >&5
+$as_echo "COLORIZE=$with_colorize" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define COLORIZE "$with_colorize"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5
-printf "%s\n" "COLORIZE=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5
+$as_echo "COLORIZE=$withval" >&6; }
     COLORIZE="$withval"
-    printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define COLORIZE "$withval"
+_ACEOF
+
+fi
+
+
+
+# Check whether --with-dynamicSpiderCache was given.
+if test "${with_dynamicSpiderCache+set}" = set; then :
+  withval=$with_dynamicSpiderCache; DYNAMIC_SPIDER_CACHE="$withval"
+    DYNAMIC_SPIDER_CACHE=`echo $DYNAMIC_SPIDER_CACHE | tr '[:upper:]' '[:lower:]'`
+    VALID_YN $DYNAMIC_SPIDER_CACHE "--with-dynamicSpiderCache=ans: ans must be yes or no"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&5
+$as_echo "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define DYNAMIC_SPIDER_CACHE "$with_dynamicSpiderCache"
+_ACEOF
+
+else
+  withval="yes"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5
+$as_echo "DYNAMIC_SPIDER_CACHE=$withval" >&6; }
+    DYNAMIC_SPIDER_CACHE="$withval"
+    cat >>confdefs.h <<_ACEOF
+#define DYNAMIC_SPIDER_CACHE "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-hiddenItalic was given.
-if test ${with_hiddenItalic+y}
-then :
+if test "${with_hiddenItalic+set}" = set; then :
   withval=$with_hiddenItalic; HIDDEN_ITALIC="$withval"
     HIDDEN_ITALIC=`echo $HIDDEN_ITALIC | tr '[:upper:]' '[:lower:]'`
     VALID_YN $HIDDEN_ITALIC "--with-hiddenItalic=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$with_hiddenItalic" >&5
-printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; }
-    printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$with_hiddenItalic" >&5
+$as_echo "HIDDEN_ITALIC=$with_hiddenItalic" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define HIDDEN_ITALIC "$with_hiddenItalic"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5
-printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5
+$as_echo "HIDDEN_ITALIC=$withval" >&6; }
     HIDDEN_ITALIC="$withval"
-    printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define HIDDEN_ITALIC "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-exactMatch was given.
-if test ${with_exactMatch+y}
-then :
+if test "${with_exactMatch+set}" = set; then :
   withval=$with_exactMatch; EXACT_MATCH="$withval"
     EXACT_MATCH=`echo $EXACT_MATCH | tr '[:upper:]' '[:lower:]'`
     VALID_YN $EXACT_MATCH "--with-exactMatch=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$with_exactMatch" >&5
-printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; }
-    printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$with_exactMatch" >&5
+$as_echo "EXACT_MATCH=$with_exactMatch" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define EXACT_MATCH "$with_exactMatch"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5
-printf "%s\n" "EXACT_MATCH=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5
+$as_echo "EXACT_MATCH=$withval" >&6; }
     EXACT_MATCH="$withval"
-    printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define EXACT_MATCH "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-lmodConfigDir was given.
-if test ${with_lmodConfigDir+y}
-then :
+if test "${with_lmodConfigDir+set}" = set; then :
   withval=$with_lmodConfigDir; LMOD_CONFIG_DIR="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$with_lmodConfigDir" >&5
-printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; }
-    printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$with_lmodConfigDir" >&5
+$as_echo "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define LMOD_CONFIG_DIR "$with_lmodConfigDir"
+_ACEOF
 
-else $as_nop
+else
   withval="/etc/lmod"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5
-printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5
+$as_echo "LMOD_CONFIG_DIR=$withval" >&6; }
     LMOD_CONFIG_DIR="$withval"
-    printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define LMOD_CONFIG_DIR "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-autoSwap was given.
-if test ${with_autoSwap+y}
-then :
+if test "${with_autoSwap+set}" = set; then :
   withval=$with_autoSwap; AUTO_SWAP="$withval"
     AUTO_SWAP=`echo $AUTO_SWAP | tr '[:upper:]' '[:lower:]'`
     VALID_YN $AUTO_SWAP "--with-autoSwap=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$with_autoSwap" >&5
-printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; }
-    printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$with_autoSwap" >&5
+$as_echo "AUTO_SWAP=$with_autoSwap" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define AUTO_SWAP "$with_autoSwap"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5
-printf "%s\n" "AUTO_SWAP=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5
+$as_echo "AUTO_SWAP=$withval" >&6; }
     AUTO_SWAP="$withval"
-    printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define AUTO_SWAP "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-exportedModuleCmd was given.
-if test ${with_exportedModuleCmd+y}
-then :
+if test "${with_exportedModuleCmd+set}" = set; then :
   withval=$with_exportedModuleCmd; with_exportedModuleCmd=`echo $with_exportedModuleCmd | tr '[:upper:]' '[:lower:]'`
     withval=$with_exportedModuleCmd
     EXPORT_MODULE="$withval"
     EXPORT_MODULE=`echo $EXPORT_MODULE | tr '[:upper:]' '[:lower:]'`
     VALID_YN $EXPORT_MODULE "--with-exportedModuleCmd=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$with_exportedModuleCmd" >&5
-printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; }
-    printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$with_exportedModuleCmd" >&5
+$as_echo "EXPORT_MODULE=$with_exportedModuleCmd" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define EXPORT_MODULE "$with_exportedModuleCmd"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5
-printf "%s\n" "EXPORT_MODULE=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5
+$as_echo "EXPORT_MODULE=$withval" >&6; }
     EXPORT_MODULE="$withval"
-    printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define EXPORT_MODULE "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-redirect was given.
-if test ${with_redirect+y}
-then :
+if test "${with_redirect+set}" = set; then :
   withval=$with_redirect; REDIRECT="$withval"
     REDIRECT=`echo $REDIRECT | tr '[:upper:]' '[:lower:]'`
     VALID_YN $REDIRECT "--with-redirect=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$with_redirect" >&5
-printf "%s\n" "REDIRECT=$with_redirect" >&6; }
-    printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$with_redirect" >&5
+$as_echo "REDIRECT=$with_redirect" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define REDIRECT "$with_redirect"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5
-printf "%s\n" "REDIRECT=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5
+$as_echo "REDIRECT=$withval" >&6; }
     REDIRECT="$withval"
-    printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define REDIRECT "$withval"
+_ACEOF
 
 fi
 
 
 # Check whether --with-module-root-path was given.
-if test ${with_module_root_path+y}
-then :
+if test "${with_module_root_path+set}" = set; then :
   withval=$with_module_root_path; MODULEPATH_ROOT="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$with_module_root_path" >&5
-printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; }
-    printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$with_module_root_path" >&5
+$as_echo "MODULEPATH_ROOT=$with_module_root_path" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define MODULEPATH_ROOT "$with_module_root_path"
+_ACEOF
 
-else $as_nop
+else
   withval="$prefix/modulefiles"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5
-printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5
+$as_echo "MODULEPATH_ROOT=$withval" >&6; }
     MODULEPATH_ROOT="$withval"
-    printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define MODULEPATH_ROOT "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-ancient was given.
-if test ${with_ancient+y}
-then :
+if test "${with_ancient+set}" = set; then :
   withval=$with_ancient; ANCIENT="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$with_ancient" >&5
-printf "%s\n" "ANCIENT=$with_ancient" >&6; }
-    printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$with_ancient" >&5
+$as_echo "ANCIENT=$with_ancient" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define ANCIENT "$with_ancient"
+_ACEOF
 
-else $as_nop
+else
   withval="86400"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5
-printf "%s\n" "ANCIENT=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5
+$as_echo "ANCIENT=$withval" >&6; }
     ANCIENT="$withval"
-    printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define ANCIENT "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-shortTime was given.
-if test ${with_shortTime+y}
-then :
+if test "${with_shortTime+set}" = set; then :
   withval=$with_shortTime; SHORT_TIME="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$with_shortTime" >&5
-printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; }
-    printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$with_shortTime" >&5
+$as_echo "SHORT_TIME=$with_shortTime" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SHORT_TIME "$with_shortTime"
+_ACEOF
 
-else $as_nop
+else
   withval="2"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5
-printf "%s\n" "SHORT_TIME=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5
+$as_echo "SHORT_TIME=$withval" >&6; }
     SHORT_TIME="$withval"
-    printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SHORT_TIME "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-useDotFiles was given.
-if test ${with_useDotFiles+y}
-then :
+if test "${with_useDotFiles+set}" = set; then :
   withval=$with_useDotFiles; USE_DOT_FILES="$withval"
     USE_DOT_FILES=`echo $USE_DOT_FILES | tr '[:upper:]' '[:lower:]'`
     VALID_YN $USE_DOT_FILES "--with-useDotFiles=yes/no: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_FILES=$with_useDotFiles" >&5
-printf "%s\n" "USE_DOT_FILES=$with_useDotFiles" >&6; }
-    printf "%s\n" "#define USE_DOT_FILES \"$with_useDotFiles\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: USE_DOT_FILES=$with_useDotFiles" >&5
+$as_echo "USE_DOT_FILES=$with_useDotFiles" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define USE_DOT_FILES "$with_useDotFiles"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_FILES=$withval" >&5
-printf "%s\n" "USE_DOT_FILES=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: USE_DOT_FILES=$withval" >&5
+$as_echo "USE_DOT_FILES=$withval" >&6; }
     USE_DOT_FILES="$withval"
-    printf "%s\n" "#define USE_DOT_FILES \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define USE_DOT_FILES "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-spiderCacheDir was given.
-if test ${with_spiderCacheDir+y}
-then :
+if test "${with_spiderCacheDir+set}" = set; then :
   withval=$with_spiderCacheDir; SPIDER_CACHE_DIRS="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&5
-printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; }
-    printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&5
+$as_echo "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SPIDER_CACHE_DIRS "$with_spiderCacheDir"
+_ACEOF
 
-else $as_nop
+else
   withval=""
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5
-printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5
+$as_echo "SPIDER_CACHE_DIRS=$withval" >&6; }
     SPIDER_CACHE_DIRS="$withval"
-    printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SPIDER_CACHE_DIRS "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-spiderCacheDescript was given.
-if test ${with_spiderCacheDescript+y}
-then :
+if test "${with_spiderCacheDescript+set}" = set; then :
   withval=$with_spiderCacheDescript; SPIDER_CACHE_DESCRIPT_FN="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&5
-printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; }
-    printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&5
+$as_echo "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SPIDER_CACHE_DESCRIPT_FN "$with_spiderCacheDescript"
+_ACEOF
 
-else $as_nop
+else
   withval=""
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5
-printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5
+$as_echo "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; }
     SPIDER_CACHE_DESCRIPT_FN="$withval"
-    printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SPIDER_CACHE_DESCRIPT_FN "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-updateSystemFn was given.
-if test ${with_updateSystemFn+y}
-then :
+if test "${with_updateSystemFn+set}" = set; then :
   withval=$with_updateSystemFn; UPDATE_SYSTEM_FN="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$with_updateSystemFn" >&5
-printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; }
-    printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$with_updateSystemFn" >&5
+$as_echo "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define UPDATE_SYSTEM_FN "$with_updateSystemFn"
+_ACEOF
 
-else $as_nop
+else
   withval=""
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5
-printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5
+$as_echo "UPDATE_SYSTEM_FN=$withval" >&6; }
     UPDATE_SYSTEM_FN="$withval"
-    printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define UPDATE_SYSTEM_FN "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-prependBlock was given.
-if test ${with_prependBlock+y}
-then :
+if test "${with_prependBlock+set}" = set; then :
   withval=$with_prependBlock; PREPEND_BLOCK="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$with_prependBlock" >&5
-printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; }
-    printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$with_prependBlock" >&5
+$as_echo "PREPEND_BLOCK=$with_prependBlock" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define PREPEND_BLOCK "$with_prependBlock"
+_ACEOF
 
-else $as_nop
+else
   withval="normal"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5
-printf "%s\n" "PREPEND_BLOCK=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5
+$as_echo "PREPEND_BLOCK=$withval" >&6; }
     PREPEND_BLOCK="$withval"
-    printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define PREPEND_BLOCK "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-siteName was given.
-if test ${with_siteName+y}
-then :
+if test "${with_siteName+set}" = set; then :
   withval=$with_siteName; SITE_NAME="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$with_siteName" >&5
-printf "%s\n" "SITE_NAME=$with_siteName" >&6; }
-    printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$with_siteName" >&5
+$as_echo "SITE_NAME=$with_siteName" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SITE_NAME "$with_siteName"
+_ACEOF
 
-else $as_nop
+else
   withval='<empty>'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5
-printf "%s\n" "SITE_NAME=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5
+$as_echo "SITE_NAME=$withval" >&6; }
     SITE_NAME="$withval"
-    printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SITE_NAME "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-syshost was given.
-if test ${with_syshost+y}
-then :
+if test "${with_syshost+set}" = set; then :
   withval=$with_syshost; SYSHOST="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$with_syshost" >&5
-printf "%s\n" "SYSHOST=$with_syshost" >&6; }
-    printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$with_syshost" >&5
+$as_echo "SYSHOST=$with_syshost" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SYSHOST "$with_syshost"
+_ACEOF
 
-else $as_nop
+else
   withval='<empty>'
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5
-printf "%s\n" "SYSHOST=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5
+$as_echo "SYSHOST=$withval" >&6; }
     SYSHOST="$withval"
-    printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SYSHOST "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-tcl was given.
-if test ${with_tcl+y}
-then :
+if test "${with_tcl+set}" = set; then :
   withval=$with_tcl; ALLOW_TCL_MFILES="$withval"
     ALLOW_TCL_MFILES=`echo $ALLOW_TCL_MFILES | tr '[:upper:]' '[:lower:]'`
     VALID_YN $ALLOW_TCL_MFILES "--with-tcl=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES==$withval" >&5
-printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; }
-    printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES==$withval" >&5
+$as_echo "ALLOW_TCL_MFILES==$withval" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define ALLOW_TCL_MFILES "$withval"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5
-printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5
+$as_echo "ALLOW_TCL_MFILES=$withval" >&6; }
     ALLOW_TCL_MFILES="$withval"
-    printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define ALLOW_TCL_MFILES "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-disableNameAutoSwap was given.
-if test ${with_disableNameAutoSwap+y}
-then :
+if test "${with_disableNameAutoSwap+set}" = set; then :
   withval=$with_disableNameAutoSwap; DISABLE_NAME_AUTOSWAP="$withval"
     DISABLE_NAME_AUTOSWAP=`echo $DISABLE_NAME_AUTOSWAP | tr '[:upper:]' '[:lower:]'`
     VALID_YN $DISABLE_NAME_AUTOSWAP "--with-disableNameAutoSwap=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP==$withval" >&5
-printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; }
-    printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP==$withval" >&5
+$as_echo "DISABLE_NAME_AUTOSWAP==$withval" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define DISABLE_NAME_AUTOSWAP "$withval"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5
-printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5
+$as_echo "DISABLE_NAME_AUTOSWAP=$withval" >&6; }
     DISABLE_NAME_AUTOSWAP="$withval"
-    printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define DISABLE_NAME_AUTOSWAP "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-mpathSearch was given.
-if test ${with_mpathSearch+y}
-then :
+if test "${with_mpathSearch+set}" = set; then :
   withval=$with_mpathSearch; MPATH_AVAIL="$withval"
     MPATH_AVAIL=`echo $MPATH_AVAIL | tr '[:upper:]' '[:lower:]'`
     VALID_YN $MPATH_AVAIL "--with-mpathSearch=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL==$withval" >&5
-printf "%s\n" "MPATH_AVAIL==$withval" >&6; }
-    printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL==$withval" >&5
+$as_echo "MPATH_AVAIL==$withval" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define MPATH_AVAIL "$withval"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5
-printf "%s\n" "MPATH_AVAIL=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5
+$as_echo "MPATH_AVAIL=$withval" >&6; }
     MPATH_AVAIL="$withval"
-    printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define MPATH_AVAIL "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-settarg was given.
-if test ${with_settarg+y}
-then :
+if test "${with_settarg+set}" = set; then :
   withval=$with_settarg; SETTARG="$withval"
     SETTARG=`echo $SETTARG | tr '[:upper:]' '[:lower:]'`
     VALID_YN $SETTARG "--with-settarg=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$with_settarg" >&5
-printf "%s\n" "SETTARG=$with_settarg" >&6; }
-    printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SETTARG=$with_settarg" >&5
+$as_echo "SETTARG=$with_settarg" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SETTARG "$with_settarg"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5
-printf "%s\n" "SETTARG=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5
+$as_echo "SETTARG=$withval" >&6; }
     SETTARG="$withval"
-    printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SETTARG "$withval"
+_ACEOF
 
 fi
 
@@ -3962,334 +3675,382 @@ DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr"
 
 
 # Check whether --with-ignoreDirs was given.
-if test ${with_ignoreDirs+y}
-then :
+if test "${with_ignoreDirs+set}" = set; then :
   withval=$with_ignoreDirs; IGNORE_DIRS="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$with_ignoreDirs" >&5
-printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; }
-    printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$with_ignoreDirs" >&5
+$as_echo "IGNORE_DIRS=$with_ignoreDirs" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define IGNORE_DIRS "$with_ignoreDirs"
+_ACEOF
 
-else $as_nop
+else
   withval="$DFLT_IGNORE_DIRS"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5
-printf "%s\n" "IGNORE_DIRS=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5
+$as_echo "IGNORE_DIRS=$withval" >&6; }
     IGNORE_DIRS="$withval"
-    printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define IGNORE_DIRS "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-pinVersions was given.
-if test ${with_pinVersions+y}
-then :
+if test "${with_pinVersions+set}" = set; then :
   withval=$with_pinVersions; PIN_VERSIONS="$withval"
     PIN_VERSIONS=`echo $PIN_VERSIONS | tr '[:upper:]' '[:lower:]'`
     VALID_YN $PIN_VERSIONS "--with-pinVersions=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$with_pinVersions" >&5
-printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; }
-    printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$with_pinVersions" >&5
+$as_echo "PIN_VERSIONS=$with_pinVersions" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define PIN_VERSIONS "$with_pinVersions"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5
-printf "%s\n" "PIN_VERSIONS=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5
+$as_echo "PIN_VERSIONS=$withval" >&6; }
     PIN_VERSIONS="$withval"
-    printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define PIN_VERSIONS "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-tmodPathRule was given.
-if test ${with_tmodPathRule+y}
-then :
+if test "${with_tmodPathRule+set}" = set; then :
   withval=$with_tmodPathRule; TMOD_PATH_RULE="$withval"
     TMOD_PATH_RULE=`echo $TMOD_PATH_RULE | tr '[:upper:]' '[:lower:]'`
     VALID_YN $TMOD_PATH_RULE "--with-tmodPathRule=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$with_tmodPathRule" >&5
-printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; }
-    printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$with_tmodPathRule" >&5
+$as_echo "TMOD_PATH_RULE=$with_tmodPathRule" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define TMOD_PATH_RULE "$with_tmodPathRule"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5
-printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5
+$as_echo "TMOD_PATH_RULE=$withval" >&6; }
     TMOD_PATH_RULE="$withval"
-    printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define TMOD_PATH_RULE "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-tmodFindFirst was given.
-if test ${with_tmodFindFirst+y}
-then :
+if test "${with_tmodFindFirst+set}" = set; then :
   withval=$with_tmodFindFirst; TMOD_FIND_FIRST="$withval"
     TMOD_FIND_FIRST=`echo $TMOD_FIND_FIRST | tr '[:upper:]' '[:lower:]'`
     VALID_YN $TMOD_FIND_FIRST "--with-tmodFindFirst=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$with_tmodFindFirst" >&5
-printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; }
-    printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$with_tmodFindFirst" >&5
+$as_echo "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define TMOD_FIND_FIRST "$with_tmodFindFirst"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5
-printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5
+$as_echo "TMOD_FIND_FIRST=$withval" >&6; }
     TMOD_FIND_FIRST="$withval"
-    printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define TMOD_FIND_FIRST "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-lua_include was given.
-if test ${with_lua_include+y}
-then :
+if test "${with_lua_include+set}" = set; then :
   withval=$with_lua_include; LUA_INCLUDE="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$with_lua_include" >&5
-printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; }
-    printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$with_lua_include" >&5
+$as_echo "LUA_INCLUDE=$with_lua_include" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define LUA_INCLUDE "$with_lua_include"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5
-printf "%s\n" "LUA_INCLUDE=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5
+$as_echo "LUA_INCLUDE=$withval" >&6; }
     LUA_INCLUDE="$withval"
-    printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define LUA_INCLUDE "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-cachedLoads was given.
-if test ${with_cachedLoads+y}
-then :
+if test "${with_cachedLoads+set}" = set; then :
   withval=$with_cachedLoads; CACHED_LOADS="$withval"
     CACHED_LOADS=`echo $CACHED_LOADS | tr '[:upper:]' '[:lower:]'`
     VALID_YN $CACHED_LOADS "--with-cachedLoads=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$with_cachedLoads" >&5
-printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; }
-    printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$with_cachedLoads" >&5
+$as_echo "CACHED_LOADS=$with_cachedLoads" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define CACHED_LOADS "$with_cachedLoads"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5
-printf "%s\n" "CACHED_LOADS=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5
+$as_echo "CACHED_LOADS=$withval" >&6; }
     CACHED_LOADS="$withval"
-    printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define CACHED_LOADS "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-extendedDefault was given.
-if test ${with_extendedDefault+y}
-then :
+if test "${with_extendedDefault+set}" = set; then :
   withval=$with_extendedDefault; EXTENDED_DEFAULT="$withval"
     EXTENDED_DEFAULT=`echo $EXTENDED_DEFAULT | tr '[:upper:]' '[:lower:]'`
     VALID_YN $EXTENDED_DEFAULT "--with-extendedDefault=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$with_extendedDefault" >&5
-printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; }
-    printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$with_extendedDefault" >&5
+$as_echo "EXTENDED_DEFAULT=$with_extendedDefault" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define EXTENDED_DEFAULT "$with_extendedDefault"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5
-printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5
+$as_echo "EXTENDED_DEFAULT=$withval" >&6; }
     EXTENDED_DEFAULT="$withval"
-    printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define EXTENDED_DEFAULT "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-supportKsh was given.
-if test ${with_supportKsh+y}
-then :
+if test "${with_supportKsh+set}" = set; then :
   withval=$with_supportKsh; SUPPORT_KSH="$withval"
     SUPPORT_KSH=`echo $SUPPORT_KSH | tr '[:upper:]' '[:lower:]'`
     VALID_YN $SUPPORT_KSH "--with-supportKsh=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$with_supportKsh" >&5
-printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; }
-    printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$with_supportKsh" >&5
+$as_echo "SUPPORT_KSH=$with_supportKsh" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SUPPORT_KSH "$with_supportKsh"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5
-printf "%s\n" "SUPPORT_KSH=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5
+$as_echo "SUPPORT_KSH=$withval" >&6; }
     SUPPORT_KSH="$withval"
-    printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SUPPORT_KSH "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-ModulePathInit was given.
-if test ${with_ModulePathInit+y}
-then :
+if test "${with_ModulePathInit+set}" = set; then :
   withval=$with_ModulePathInit; MODULEPATH_INIT="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$with_ModulePathInit" >&5
-printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; }
-    printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$with_ModulePathInit" >&5
+$as_echo "MODULEPATH_INIT=$with_ModulePathInit" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define MODULEPATH_INIT "$with_ModulePathInit"
+_ACEOF
 
-else $as_nop
+else
   withval="@PKG@/init/.modulespath"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5
-printf "%s\n" "MODULEPATH_INIT=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5
+$as_echo "MODULEPATH_INIT=$withval" >&6; }
     MODULEPATH_INIT="$withval"
-    printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define MODULEPATH_INIT "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-siteControlPrefix was given.
-if test ${with_siteControlPrefix+y}
-then :
+if test "${with_siteControlPrefix+set}" = set; then :
   withval=$with_siteControlPrefix; SITE_CONTROLLED_PREFIX="$withval"
     SITE_CONTROLLED_PREFIX=`echo $SITE_CONTROLLED_PREFIX | tr '[:upper:]' '[:lower:]'`
     VALID_YN $SITE_CONTROLLED_PREFIX "--with-siteControlPrefix=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&5
-printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; }
-    printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&5
+$as_echo "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SITE_CONTROLLED_PREFIX "$with_siteControlPrefix"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5
-printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5
+$as_echo "SITE_CONTROLLED_PREFIX=$withval" >&6; }
     SITE_CONTROLLED_PREFIX="$withval"
-    printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SITE_CONTROLLED_PREFIX "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-useBuiltinPkgs was given.
-if test ${with_useBuiltinPkgs+y}
-then :
+if test "${with_useBuiltinPkgs+set}" = set; then :
   withval=$with_useBuiltinPkgs; USE_BUILT_IN_PKGS="$withval"
     USE_BUILT_IN_PKGS=`echo $USE_BUILT_IN_PKGS | tr '[:upper:]' '[:lower:]'`
     VALID_YN $USE_BUILT_IN_PKGS "--with-useBuiltinPkgs=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&5
-printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; }
-    printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&5
+$as_echo "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define USE_BUILT_IN_PKGS "$with_useBuiltinPkgs"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5
-printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5
+$as_echo "USE_BUILT_IN_PKGS=$withval" >&6; }
     USE_BUILT_IN_PKGS="$withval"
-    printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define USE_BUILT_IN_PKGS "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-silentShellDebugging was given.
-if test ${with_silentShellDebugging+y}
-then :
+if test "${with_silentShellDebugging+set}" = set; then :
   withval=$with_silentShellDebugging; SILENCE_SHELL_DEBUGGING="$withval"
     SILENCE_SHELL_DEBUGGING=`echo $SILENCE_SHELL_DEBUGGING | tr '[:upper:]' '[:lower:]'`
     VALID_YN $SILENCE_SHELL_DEBUGGING "--with-silentShellDebugging=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&5
-printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; }
-    printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&5
+$as_echo "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define SILENCE_SHELL_DEBUGGING "$with_silentShellDebugging"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5
-printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5
+$as_echo "SILENCE_SHELL_DEBUGGING=$withval" >&6; }
     SILENCE_SHELL_DEBUGGING="$withval"
-    printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define SILENCE_SHELL_DEBUGGING "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-fastTCLInterp was given.
-if test ${with_fastTCLInterp+y}
-then :
+if test "${with_fastTCLInterp+set}" = set; then :
   withval=$with_fastTCLInterp; FAST_TCL_INTERP="$withval"
     FAST_TCL_INTERP=`echo $FAST_TCL_INTERP | tr '[:upper:]' '[:lower:]'`
     VALID_YN $FAST_TCL_INTERP "--with-fastTCLInterp=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$with_fastTCLInterp" >&5
-printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; }
-    printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$with_fastTCLInterp" >&5
+$as_echo "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define FAST_TCL_INTERP "$with_fastTCLInterp"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5
-printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5
+$as_echo "FAST_TCL_INTERP=$withval" >&6; }
     FAST_TCL_INTERP="$withval"
-    printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define FAST_TCL_INTERP "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-availExtensions was given.
-if test ${with_availExtensions+y}
-then :
+if test "${with_availExtensions+set}" = set; then :
   withval=$with_availExtensions; AVAIL_EXTENSIONS="$withval"
     AVAIL_EXTENSIONS=`echo $AVAIL_EXTENSIONS | tr '[:upper:]' '[:lower:]'`
     VALID_YN $AVAIL_EXTENSIONS "--with-availExtensions=ans: ans must be yes or no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$with_availExtensions" >&5
-printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; }
-    printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$with_availExtensions" >&5
+$as_echo "AVAIL_EXTENSIONS=$with_availExtensions" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define AVAIL_EXTENSIONS "$with_availExtensions"
+_ACEOF
 
-else $as_nop
+else
   withval="yes"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5
-printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5
+$as_echo "AVAIL_EXTENSIONS=$withval" >&6; }
     AVAIL_EXTENSIONS="$withval"
-    printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h
+    cat >>confdefs.h <<_ACEOF
+#define AVAIL_EXTENSIONS "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-lua was given.
-if test ${with_lua+y}
-then :
+if test "${with_lua+set}" = set; then :
   withval=$with_lua; PATH_TO_LUA="$withval"
     if test ${PATH_TO_LUA:0:1} != '/' ; then
       echo "Path to lua must be absolute"
       exit 1
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$with_lua" >&5
-printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; }
-    printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$with_lua" >&5
+$as_echo "PATH_TO_LUA=$with_lua" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define PATH_TO_LUA "$with_lua"
+_ACEOF
 
-else $as_nop
+else
   withval="lua"
     PATH_TO_LUA="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5
-printf "%s\n" "PATH_TO_LUA=$withval" >&6; }
-    printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5
+$as_echo "PATH_TO_LUA=$withval" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define PATH_TO_LUA "$withval"
+_ACEOF
 
 fi
 
 
 
 # Check whether --with-luac was given.
-if test ${with_luac+y}
-then :
+if test "${with_luac+set}" = set; then :
   withval=$with_luac; PATH_TO_LUAC="$withval"
     if test ${PATH_TO_LUAC:0:1} != '/' ; then
       echo "Path to luac must be absolute"
       exit 1
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$with_luac" >&5
-printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; }
-    printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$with_luac" >&5
+$as_echo "PATH_TO_LUAC=$with_luac" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define PATH_TO_LUAC "$with_luac"
+_ACEOF
 
-else $as_nop
+else
   withval="luac"
     PATH_TO_LUAC="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5
-printf "%s\n" "PATH_TO_LUAC=$withval" >&6; }
-    printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5
+$as_echo "PATH_TO_LUAC=$withval" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define PATH_TO_LUAC "$withval"
+_ACEOF
 
 fi
 
@@ -4297,20 +4058,23 @@ fi
 
 
 # Check whether --with-luaSuffix was given.
-if test ${with_luaSuffix+y}
-then :
+if test "${with_luaSuffix+set}" = set; then :
   withval=$with_luaSuffix; LUA_SUFFIX="$withval"
     LUA_SUFFIX=`echo $LUA_SUFFIX | tr '[:upper:]' '[:lower:]'`
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$with_luaSuffic" >&5
-printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; }
-    printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$with_luaSuffic" >&5
+$as_echo "LUA_SUFFIX=$with_luaSuffic" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define LUA_SUFFIX "$with_luaSuffix"
+_ACEOF
 
-else $as_nop
+else
   withval="no"
     LUA_SUFFIX="$withval"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5
-printf "%s\n" "LUA_SUFFIX=$withval" >&6; }
-    printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5
+$as_echo "LUA_SUFFIX=$withval" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define LUA_SUFFIX "$withval"
+_ACEOF
 
 fi
 
@@ -4335,12 +4099,11 @@ if test "$FAST_TCL_INTERP" = yes ; then
    if test -z "$TCL_INCLUDE" ; then
        # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_pkgConfig+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_pkgConfig+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $pkgConfig in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path.
@@ -4350,15 +4113,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_pkgConfig="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_pkgConfig="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4371,11 +4130,11 @@ esac
 fi
 pkgConfig=$ac_cv_path_pkgConfig
 if test -n "$pkgConfig"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pkgConfig" >&5
-printf "%s\n" "$pkgConfig" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pkgConfig" >&5
+$as_echo "$pkgConfig" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4394,54 +4153,421 @@ fi
    CPPFLAGS="$TCL_INCLUDE"
 
 
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${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 ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
-  if test $ac_cache; then
-    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
-    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
     fi
-    ac_header= ac_cache=
-  elif test $ac_header; then
-    ac_cache=$ac_item
-  else
-    ac_header=$ac_item
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+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
   fi
-done
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+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
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $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 ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
 
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
+fi
 
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
 
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
 
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
+fi
 
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
-if test "x$ac_cv_header_tcl_h" = xyes
-then :
 
-printf "%s\n" "#define HAVE_TCL_H 1" >>confdefs.h
+done
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
+if test "x$ac_cv_header_tcl_h" = xyes; then :
+
+$as_echo "#define HAVE_TCL_H 1" >>confdefs.h
 
 fi
 
 
+
    if test "$ac_cv_header_tcl_h" != yes ; then
       rm -f makefile
       as_fn_error $? "Unable to build Lmod without tcl.h.  Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" "$LINENO" 5
    fi
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_CreateInterp" >&5
-printf %s "checking for library containing Tcl_CreateInterp... " >&6; }
-if test ${ac_cv_search_Tcl_CreateInterp+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_CreateInterp" >&5
+$as_echo_n "checking for library containing Tcl_CreateInterp... " >&6; }
+if ${ac_cv_search_Tcl_CreateInterp+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4449,51 +4575,49 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char Tcl_CreateInterp ();
 int
-main (void)
+main ()
 {
 return Tcl_CreateInterp ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5
-do
+for ac_lib in '' tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib $TCL_LIBS $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"
-then :
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_Tcl_CreateInterp=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_Tcl_CreateInterp+y}
-then :
+  if ${ac_cv_search_Tcl_CreateInterp+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_Tcl_CreateInterp+y}
-then :
+if ${ac_cv_search_Tcl_CreateInterp+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_Tcl_CreateInterp=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5
-printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5
+$as_echo "$ac_cv_search_Tcl_CreateInterp" >&6; }
 ac_res=$ac_cv_search_Tcl_CreateInterp
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-else $as_nop
+else
   rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5
 fi
 
@@ -4528,12 +4652,11 @@ PATH_TO_SRC=$SRCDIR
 
 # Extract the first word of "ps", so it can be a program name with args.
 set dummy ps; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PS+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $PS in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PS="$PS" # Let the user override the test with a path.
@@ -4543,15 +4666,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PS="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4564,11 +4683,11 @@ esac
 fi
 PS=$ac_cv_path_PS
 if test -n "$PS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PS" >&5
-printf "%s\n" "$PS" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS" >&5
+$as_echo "$PS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4582,12 +4701,11 @@ fi
 
 # Extract the first word of "readlink", so it can be a program name with args.
 set dummy readlink; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_READLINK+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_READLINK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $READLINK in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path.
@@ -4597,15 +4715,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_READLINK="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4618,11 +4732,11 @@ esac
 fi
 READLINK=$ac_cv_path_READLINK
 if test -n "$READLINK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $READLINK" >&5
-printf "%s\n" "$READLINK" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINK" >&5
+$as_echo "$READLINK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4638,12 +4752,11 @@ for ac_prog in gexpr expr
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_EXPR+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_EXPR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $EXPR in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path.
@@ -4653,15 +4766,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_EXPR="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_EXPR="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4673,11 +4782,11 @@ esac
 fi
 EXPR=$ac_cv_path_EXPR
 if test -n "$EXPR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXPR" >&5
-printf "%s\n" "$EXPR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPR" >&5
+$as_echo "$EXPR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4697,12 +4806,11 @@ for ac_prog in gbasename basename
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_BASENAME+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_BASENAME+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $BASENAME in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path.
@@ -4712,15 +4820,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_BASENAME="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4732,11 +4836,11 @@ esac
 fi
 BASENAME=$ac_cv_path_BASENAME
 if test -n "$BASENAME"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5
-printf "%s\n" "$BASENAME" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5
+$as_echo "$BASENAME" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4754,12 +4858,11 @@ fi
 
 # Extract the first word of "git", so it can be a program name with args.
 set dummy git; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PATH_TO_GIT+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_TO_GIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $PATH_TO_GIT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path.
@@ -4769,15 +4872,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PATH_TO_GIT="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_TO_GIT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4790,11 +4889,11 @@ esac
 fi
 PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT
 if test -n "$PATH_TO_GIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_GIT" >&5
-printf "%s\n" "$PATH_TO_GIT" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_GIT" >&5
+$as_echo "$PATH_TO_GIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4802,12 +4901,11 @@ for ac_prog in less more
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PATH_TO_PAGER+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_TO_PAGER+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $PATH_TO_PAGER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path.
@@ -4817,15 +4915,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PATH_TO_PAGER="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_TO_PAGER="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4837,11 +4931,11 @@ esac
 fi
 PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER
 if test -n "$PATH_TO_PAGER"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_PAGER" >&5
-printf "%s\n" "$PATH_TO_PAGER" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_PAGER" >&5
+$as_echo "$PATH_TO_PAGER" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4854,12 +4948,11 @@ for ac_prog in sha1sum gsha1sum shasum md5sum gmd5sum md5
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PATH_TO_HASHSUM+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_TO_HASHSUM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $PATH_TO_HASHSUM in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path.
@@ -4869,15 +4962,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PATH_TO_HASHSUM="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_TO_HASHSUM="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4889,11 +4978,11 @@ esac
 fi
 PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM
 if test -n "$PATH_TO_HASHSUM"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_HASHSUM" >&5
-printf "%s\n" "$PATH_TO_HASHSUM" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_HASHSUM" >&5
+$as_echo "$PATH_TO_HASHSUM" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4913,12 +5002,11 @@ fi
 
 # Extract the first word of "tclsh", so it can be a program name with args.
 set dummy tclsh; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PATH_TO_TCLSH+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_TO_TCLSH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $PATH_TO_TCLSH in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path.
@@ -4928,15 +5016,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PATH_TO_TCLSH="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_TO_TCLSH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4949,11 +5033,11 @@ esac
 fi
 PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH
 if test -n "$PATH_TO_TCLSH"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_TCLSH" >&5
-printf "%s\n" "$PATH_TO_TCLSH" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_TCLSH" >&5
+$as_echo "$PATH_TO_TCLSH" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4968,12 +5052,11 @@ for ac_prog in gtr tr
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PATH_TO_TR+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_TO_TR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $PATH_TO_TR in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path.
@@ -4983,15 +5066,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PATH_TO_TR="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_TO_TR="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5003,11 +5082,11 @@ esac
 fi
 PATH_TO_TR=$ac_cv_path_PATH_TO_TR
 if test -n "$PATH_TO_TR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_TR" >&5
-printf "%s\n" "$PATH_TO_TR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_TR" >&5
+$as_echo "$PATH_TO_TR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5019,12 +5098,11 @@ for ac_prog in gls ls
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PATH_TO_LS+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_TO_LS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $PATH_TO_LS in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path.
@@ -5034,15 +5112,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PATH_TO_LS="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_TO_LS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5054,11 +5128,11 @@ esac
 fi
 PATH_TO_LS=$ac_cv_path_PATH_TO_LS
 if test -n "$PATH_TO_LS"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_LS" >&5
-printf "%s\n" "$PATH_TO_LS" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_LS" >&5
+$as_echo "$PATH_TO_LS" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5110,12 +5184,11 @@ fi
 if test ${PATH_TO_LUA:0:1} != '/' ; then
   # Extract the first word of "$PATH_TO_LUA", so it can be a program name with args.
 set dummy $PATH_TO_LUA; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_FIND_PATH_TO_LUA+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FIND_PATH_TO_LUA+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $FIND_PATH_TO_LUA in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path.
@@ -5125,15 +5198,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_FIND_PATH_TO_LUA="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_FIND_PATH_TO_LUA="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5145,11 +5214,11 @@ esac
 fi
 FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA
 if test -n "$FIND_PATH_TO_LUA"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FIND_PATH_TO_LUA" >&5
-printf "%s\n" "$FIND_PATH_TO_LUA" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND_PATH_TO_LUA" >&5
+$as_echo "$FIND_PATH_TO_LUA" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5165,12 +5234,11 @@ fi
 if test "${PATH_TO_LUAC:0:1}" != '/' ; then
   # Extract the first word of "$PATH_TO_LUAC", so it can be a program name with args.
 set dummy $PATH_TO_LUAC; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_FIND_PATH_TO_LUAC+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FIND_PATH_TO_LUAC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $FIND_PATH_TO_LUAC in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path.
@@ -5180,15 +5248,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_FIND_PATH_TO_LUAC="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_FIND_PATH_TO_LUAC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5200,11 +5264,11 @@ esac
 fi
 FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC
 if test -n "$FIND_PATH_TO_LUAC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FIND_PATH_TO_LUAC" >&5
-printf "%s\n" "$FIND_PATH_TO_LUAC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND_PATH_TO_LUAC" >&5
+$as_echo "$FIND_PATH_TO_LUAC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5337,12 +5401,11 @@ fi
 if ! test -f $LUA_INCLUDE/lua.h; then
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_pkgConfig+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_pkgConfig+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $pkgConfig in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path.
@@ -5352,15 +5415,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_pkgConfig="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_pkgConfig="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5373,11 +5432,11 @@ esac
 fi
 pkgConfig=$ac_cv_path_pkgConfig
 if test -n "$pkgConfig"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pkgConfig" >&5
-printf "%s\n" "$pkgConfig" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pkgConfig" >&5
+$as_echo "$pkgConfig" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5419,12 +5478,11 @@ fi
 
 # Extract the first word of "zsh", so it can be a program name with args.
 set dummy zsh; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_ZSH+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ZSH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   case $ZSH in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path.
@@ -5434,15 +5492,11 @@ else $as_nop
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_ZSH="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ZSH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5454,11 +5508,11 @@ esac
 fi
 ZSH=$ac_cv_path_ZSH
 if test -n "$ZSH"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZSH" >&5
-printf "%s\n" "$ZSH" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZSH" >&5
+$as_echo "$ZSH" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5522,8 +5576,8 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -5553,15 +5607,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -5575,8 +5629,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -5629,7 +5683,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -5645,8 +5699,8 @@ LTLIBOBJS=$ac_ltlibobjs
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -5669,16 +5723,14 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else $as_nop
+else
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -5688,46 +5740,46 @@ esac
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -5736,6 +5788,13 @@ if ${PATH_SEPARATOR+false} :; then
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -5744,12 +5803,8 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
@@ -5761,10 +5816,30 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -5777,14 +5852,13 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -5811,20 +5885,18 @@ as_fn_unset ()
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
-
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else $as_nop
+else
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -5836,13 +5908,12 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else $as_nop
+else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -5873,7 +5944,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -5895,10 +5966,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -5912,12 +5979,6 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -5959,7 +6020,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -5968,7 +6029,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6031,7 +6092,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -6080,16 +6141,14 @@ $config_files
 Report bugs to the package provider."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config='$ac_cs_config_escaped'
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.71,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -6126,21 +6185,21 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -6168,7 +6227,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -6182,7 +6241,7 @@ exec 5>>config.log
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  printf "%s\n" "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
@@ -6207,7 +6266,7 @@ done
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -6435,7 +6494,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -6443,17 +6502,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`$as_echo "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -6470,7 +6529,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6494,9 +6553,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -6549,8 +6608,8 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -6592,9 +6651,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { 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"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $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
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$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 "$ac_tmp/stdin"
@@ -6641,8 +6700,8 @@ if test "$no_create" != yes; then
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
@@ -6711,6 +6770,7 @@ echo "Support KSH................................................." : $SUPPORT_K
 echo "Use the fast TCL interpreter................................" : $FAST_TCL_INTERP
 echo "LMOD_CONFIG_DIR............................................." : $LMOD_CONFIG_DIR
 echo "Display Extensions w/ module avail.........................." : $AVAIL_EXTENSIONS
+echo "Dynamic Spider Cache support................................" : $DYNAMIC_SPIDER_CACHE
 echo "Allow for extended default.(ml intel/17 #-> intel/17.0.4)..." : $EXTENDED_DEFAULT  #"
 
 echo
@@ -6782,4 +6842,3 @@ echo "    $ make pre-install   # -> Install everything but the symbolic link"
 echo
 
 
-
diff --git a/configure.ac b/configure.ac
index eee1397f4..cbc2b2063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,20 @@ AC_ARG_WITH(colorize,
     COLORIZE="$withval"
     AC_DEFINE_UNQUOTED(COLORIZE, "$withval"))dnl
 
+AC_SUBST(DYNAMIC_SPIDER_CACHE)
+AC_ARG_WITH(dynamicSpiderCache,
+    AC_HELP_STRING([--with-dynamicSpiderCache=ans],[allow for Dynamic Spider Cache usage [[yes]]]),
+    DYNAMIC_SPIDER_CACHE="$withval"
+    DYNAMIC_SPIDER_CACHE=`echo $DYNAMIC_SPIDER_CACHE | tr '@<:@:upper:@:>@' '@<:@:lower:@:>@'`
+    VALID_YN $DYNAMIC_SPIDER_CACHE "--with-dynamicSpiderCache=ans: ans must be yes or no"
+    AC_MSG_RESULT([DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache])
+    AC_DEFINE_UNQUOTED(DYNAMIC_SPIDER_CACHE, "$with_dynamicSpiderCache")dnl
+    ,
+    withval="yes"
+    AC_MSG_RESULT([DYNAMIC_SPIDER_CACHE=$withval])
+    DYNAMIC_SPIDER_CACHE="$withval"
+    AC_DEFINE_UNQUOTED(DYNAMIC_SPIDER_CACHE, "$withval"))dnl
+
 AC_SUBST(HIDDEN_ITALIC)
 AC_ARG_WITH(hiddenItalic,
     AC_HELP_STRING([--with-hiddenItalic=ans],[Use italic for hidden module instead of faint[[no]]]),
diff --git a/docs/source/025_new.rst b/docs/source/025_new.rst
index 3f81b885f..024495912 100644
--- a/docs/source/025_new.rst
+++ b/docs/source/025_new.rst
@@ -1,6 +1,24 @@
 New Features in Lmod
 ====================
 
+**Dynamic Spider Cache Support**:
+     (Lmod 8.7.4+): If a modulefile changes $MODULEPATH, it is marked
+     as dynamic and is re-read when performing a *module spider*.
+     This is to allow sites to dynamically add in modulefiles in user
+     directories.  This can be turned off at configure time or with by
+     setting LMOD_DYNAMIC_SPIDER_CACHE=no.
+
+**Warning when reading too many non-modulefile**:
+     Lmod (8.7.4+): To catch directory that are full of
+     non-modulefiles, Lmod count the number of regular files that do
+     not start with a ".". If there are more than 100, Lmod reports
+     a warning.
+
+**Loading a modulefile too many times**:
+     (Lmod 8.7.3+): Lmod throws an error if any modulefile is loaded
+     500 time or more in a single module command.  This is to prevent
+     infinite load loops.
+
 **An unload cannot fail**:
      As of Lmod 8.7+, an error found during unload is treated as a
      warning.
@@ -14,7 +32,7 @@ New Features in Lmod
      This TCL modulefile will generate its output at the beginning of the
      modulefile evaluation. New in Lmod 8.7. This matches Tmod 5.1.
 
-**LmodBreak** (msg):
+**LmodBreak**:
      LmodBreak() modulefile function causes the evaluation of the
      current modulefile to stop and all changed in the user's
      environment to be ignored from the current modulefile.  However,
diff --git a/docs/source/090_configuring_lmod.rst b/docs/source/090_configuring_lmod.rst
index 9ae6d970e..51619115b 100644
--- a/docs/source/090_configuring_lmod.rst
+++ b/docs/source/090_configuring_lmod.rst
@@ -116,7 +116,7 @@ the configuration option which will set the action.
   setting this to no means that your site will have to use either the
   "default" symlink or ".modulerc.lua" to specify defaults.
 
-**LMOD_ANCIENT**:
+**LMOD_ANCIENT_TIME**:
   [number, default:86400, --with-ancient].  The number of seconds that
   the user's personal cache is considered valid.
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 23d8a2e25..f3e2b781e 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -2,6 +2,17 @@
 Lmod: A New Environment Module System
 =====================================
 
+Monthly Zoom Meeting
+====================
+
+      **NOTE**
+      Lmod is holding Monthly Zoom meeting to discuss various topics.
+      Typically the first Tuesday of the Month at 9:30 U.S. Central. Which
+      is 14:30 UTC or 15:30 UTC in the winter months.
+
+      See: https://github.com/TACC/Lmod/wiki for details
+
+
 PURPOSE
 ^^^^^^^
 
diff --git a/rt/avail/avail.tdesc b/rt/avail/avail.tdesc
index 19c2c0863..28c14ba01 100644
--- a/rt/avail/avail.tdesc
+++ b/rt/avail/avail.tdesc
@@ -77,6 +77,15 @@ testdescript = {
      runLmod load B                   #35
      runLmod list                     #36
 
+     -- Test when there are too many non modulefile that start with .
+     runLmod use $(testDir)/mf/Core8  #37
+     runLmod avail
+
+     -- Test when there are too many non modulefile that do not start with .
+     runLmod use $(testDir)/mf/Core9  #38
+
+     
+
 
      HOME=$ORIG_HOME
 
diff --git a/rt/avail/err.txt b/rt/avail/err.txt
index a8da149d1..3b5ed3bdd 100644
--- a/rt/avail/err.txt
+++ b/rt/avail/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 2
@@ -493,3 +493,25 @@ lua ProjectDIR/src/lmod.in.lua bash --regression_testing list
 ===========================
 Currently Loaded Modules:
   1) A/1.2   2) B/1.0
+===========================
+step 37
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing use ProjectDIR/rt/avail/mf/Core8
+===========================
+===========================
+step 38
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing avail
+===========================
+ProjectDIR/rt/avail/mf/Core7
+   A/1.2 (L)    B/1.0 (L)    C/3.2
+  Where:
+   L:  Module is loaded
+If the avail list is too long consider trying:
+"module --default avail" or "ml -d av" to just list the default modules.
+"module overview" or "ml ov" to display the number of modules for each name.
+Use "module spider" to find all possible modules and extensions.
+Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys".
+===========================
+step 39
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing use ProjectDIR/rt/avail/mf/Core9
+===========================
+Lmod Warning: MODULEPATH directory: "ProjectDIR/rt/avail/mf/Core9" has too many non-modulefiles (101). Please make sure that modulefiles are in their own directory and not mixed in with non-modulefiles (e.g. source code)
diff --git a/rt/avail/mf/Core8/.1 b/rt/avail/mf/Core8/.1
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.1
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.10 b/rt/avail/mf/Core8/.10
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.10
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.100 b/rt/avail/mf/Core8/.100
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.100
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.101 b/rt/avail/mf/Core8/.101
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.101
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.11 b/rt/avail/mf/Core8/.11
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.11
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.12 b/rt/avail/mf/Core8/.12
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.12
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.13 b/rt/avail/mf/Core8/.13
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.13
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.14 b/rt/avail/mf/Core8/.14
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.14
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.15 b/rt/avail/mf/Core8/.15
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.15
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.16 b/rt/avail/mf/Core8/.16
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.16
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.17 b/rt/avail/mf/Core8/.17
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.17
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.18 b/rt/avail/mf/Core8/.18
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.18
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.19 b/rt/avail/mf/Core8/.19
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.19
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.2 b/rt/avail/mf/Core8/.2
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.2
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.20 b/rt/avail/mf/Core8/.20
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.20
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.21 b/rt/avail/mf/Core8/.21
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.21
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.22 b/rt/avail/mf/Core8/.22
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.22
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.23 b/rt/avail/mf/Core8/.23
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.23
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.24 b/rt/avail/mf/Core8/.24
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.24
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.25 b/rt/avail/mf/Core8/.25
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.25
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.26 b/rt/avail/mf/Core8/.26
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.26
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.27 b/rt/avail/mf/Core8/.27
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.27
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.28 b/rt/avail/mf/Core8/.28
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.28
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.29 b/rt/avail/mf/Core8/.29
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.29
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.3 b/rt/avail/mf/Core8/.3
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.3
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.30 b/rt/avail/mf/Core8/.30
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.30
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.31 b/rt/avail/mf/Core8/.31
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.31
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.32 b/rt/avail/mf/Core8/.32
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.32
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.33 b/rt/avail/mf/Core8/.33
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.33
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.34 b/rt/avail/mf/Core8/.34
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.34
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.35 b/rt/avail/mf/Core8/.35
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.35
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.36 b/rt/avail/mf/Core8/.36
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.36
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.37 b/rt/avail/mf/Core8/.37
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.37
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.38 b/rt/avail/mf/Core8/.38
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.38
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.39 b/rt/avail/mf/Core8/.39
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.39
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.4 b/rt/avail/mf/Core8/.4
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.4
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.40 b/rt/avail/mf/Core8/.40
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.40
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.41 b/rt/avail/mf/Core8/.41
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.41
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.42 b/rt/avail/mf/Core8/.42
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.42
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.43 b/rt/avail/mf/Core8/.43
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.43
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.44 b/rt/avail/mf/Core8/.44
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.44
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.45 b/rt/avail/mf/Core8/.45
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.45
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.46 b/rt/avail/mf/Core8/.46
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.46
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.47 b/rt/avail/mf/Core8/.47
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.47
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.48 b/rt/avail/mf/Core8/.48
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.48
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.49 b/rt/avail/mf/Core8/.49
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.49
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.5 b/rt/avail/mf/Core8/.5
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.5
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.50 b/rt/avail/mf/Core8/.50
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.50
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.51 b/rt/avail/mf/Core8/.51
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.51
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.52 b/rt/avail/mf/Core8/.52
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.52
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.53 b/rt/avail/mf/Core8/.53
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.53
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.54 b/rt/avail/mf/Core8/.54
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.54
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.55 b/rt/avail/mf/Core8/.55
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.55
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.56 b/rt/avail/mf/Core8/.56
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.56
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.57 b/rt/avail/mf/Core8/.57
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.57
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.58 b/rt/avail/mf/Core8/.58
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.58
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.59 b/rt/avail/mf/Core8/.59
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.59
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.6 b/rt/avail/mf/Core8/.6
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.6
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.60 b/rt/avail/mf/Core8/.60
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.60
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.61 b/rt/avail/mf/Core8/.61
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.61
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.62 b/rt/avail/mf/Core8/.62
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.62
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.63 b/rt/avail/mf/Core8/.63
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.63
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.64 b/rt/avail/mf/Core8/.64
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.64
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.65 b/rt/avail/mf/Core8/.65
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.65
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.66 b/rt/avail/mf/Core8/.66
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.66
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.67 b/rt/avail/mf/Core8/.67
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.67
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.68 b/rt/avail/mf/Core8/.68
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.68
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.69 b/rt/avail/mf/Core8/.69
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.69
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.7 b/rt/avail/mf/Core8/.7
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.7
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.70 b/rt/avail/mf/Core8/.70
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.70
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.71 b/rt/avail/mf/Core8/.71
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.71
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.72 b/rt/avail/mf/Core8/.72
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.72
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.73 b/rt/avail/mf/Core8/.73
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.73
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.74 b/rt/avail/mf/Core8/.74
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.74
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.75 b/rt/avail/mf/Core8/.75
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.75
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.76 b/rt/avail/mf/Core8/.76
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.76
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.77 b/rt/avail/mf/Core8/.77
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.77
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.78 b/rt/avail/mf/Core8/.78
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.78
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.79 b/rt/avail/mf/Core8/.79
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.79
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.8 b/rt/avail/mf/Core8/.8
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.8
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.80 b/rt/avail/mf/Core8/.80
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.80
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.81 b/rt/avail/mf/Core8/.81
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.81
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.82 b/rt/avail/mf/Core8/.82
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.82
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.83 b/rt/avail/mf/Core8/.83
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.83
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.84 b/rt/avail/mf/Core8/.84
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.84
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.85 b/rt/avail/mf/Core8/.85
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.85
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.86 b/rt/avail/mf/Core8/.86
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.86
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.87 b/rt/avail/mf/Core8/.87
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.87
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.88 b/rt/avail/mf/Core8/.88
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.88
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.89 b/rt/avail/mf/Core8/.89
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.89
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.9 b/rt/avail/mf/Core8/.9
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.9
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.90 b/rt/avail/mf/Core8/.90
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.90
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.91 b/rt/avail/mf/Core8/.91
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.91
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.92 b/rt/avail/mf/Core8/.92
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.92
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.93 b/rt/avail/mf/Core8/.93
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.93
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.94 b/rt/avail/mf/Core8/.94
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.94
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.95 b/rt/avail/mf/Core8/.95
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.95
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.96 b/rt/avail/mf/Core8/.96
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.96
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.97 b/rt/avail/mf/Core8/.97
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.97
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.98 b/rt/avail/mf/Core8/.98
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.98
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core8/.99 b/rt/avail/mf/Core8/.99
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core8/.99
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/1 b/rt/avail/mf/Core9/package/1
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/1
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/10 b/rt/avail/mf/Core9/package/10
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/10
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/100 b/rt/avail/mf/Core9/package/100
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/100
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/101 b/rt/avail/mf/Core9/package/101
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/101
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/11 b/rt/avail/mf/Core9/package/11
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/11
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/12 b/rt/avail/mf/Core9/package/12
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/12
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/13 b/rt/avail/mf/Core9/package/13
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/13
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/14 b/rt/avail/mf/Core9/package/14
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/14
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/15 b/rt/avail/mf/Core9/package/15
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/15
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/16 b/rt/avail/mf/Core9/package/16
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/16
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/17 b/rt/avail/mf/Core9/package/17
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/17
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/18 b/rt/avail/mf/Core9/package/18
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/18
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/19 b/rt/avail/mf/Core9/package/19
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/19
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/2 b/rt/avail/mf/Core9/package/2
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/2
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/20 b/rt/avail/mf/Core9/package/20
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/20
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/21 b/rt/avail/mf/Core9/package/21
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/21
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/22 b/rt/avail/mf/Core9/package/22
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/22
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/23 b/rt/avail/mf/Core9/package/23
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/23
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/24 b/rt/avail/mf/Core9/package/24
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/24
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/25 b/rt/avail/mf/Core9/package/25
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/25
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/26 b/rt/avail/mf/Core9/package/26
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/26
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/27 b/rt/avail/mf/Core9/package/27
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/27
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/28 b/rt/avail/mf/Core9/package/28
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/28
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/29 b/rt/avail/mf/Core9/package/29
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/29
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/3 b/rt/avail/mf/Core9/package/3
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/3
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/30 b/rt/avail/mf/Core9/package/30
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/30
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/31 b/rt/avail/mf/Core9/package/31
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/31
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/32 b/rt/avail/mf/Core9/package/32
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/32
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/33 b/rt/avail/mf/Core9/package/33
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/33
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/34 b/rt/avail/mf/Core9/package/34
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/34
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/35 b/rt/avail/mf/Core9/package/35
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/35
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/36 b/rt/avail/mf/Core9/package/36
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/36
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/37 b/rt/avail/mf/Core9/package/37
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/37
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/38 b/rt/avail/mf/Core9/package/38
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/38
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/39 b/rt/avail/mf/Core9/package/39
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/39
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/4 b/rt/avail/mf/Core9/package/4
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/4
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/40 b/rt/avail/mf/Core9/package/40
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/40
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/41 b/rt/avail/mf/Core9/package/41
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/41
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/42 b/rt/avail/mf/Core9/package/42
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/42
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/43 b/rt/avail/mf/Core9/package/43
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/43
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/44 b/rt/avail/mf/Core9/package/44
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/44
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/45 b/rt/avail/mf/Core9/package/45
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/45
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/46 b/rt/avail/mf/Core9/package/46
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/46
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/47 b/rt/avail/mf/Core9/package/47
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/47
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/48 b/rt/avail/mf/Core9/package/48
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/48
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/49 b/rt/avail/mf/Core9/package/49
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/49
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/5 b/rt/avail/mf/Core9/package/5
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/5
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/50 b/rt/avail/mf/Core9/package/50
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/50
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/51 b/rt/avail/mf/Core9/package/51
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/51
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/52 b/rt/avail/mf/Core9/package/52
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/52
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/53 b/rt/avail/mf/Core9/package/53
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/53
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/54 b/rt/avail/mf/Core9/package/54
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/54
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/55 b/rt/avail/mf/Core9/package/55
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/55
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/56 b/rt/avail/mf/Core9/package/56
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/56
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/57 b/rt/avail/mf/Core9/package/57
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/57
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/58 b/rt/avail/mf/Core9/package/58
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/58
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/59 b/rt/avail/mf/Core9/package/59
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/59
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/6 b/rt/avail/mf/Core9/package/6
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/6
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/60 b/rt/avail/mf/Core9/package/60
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/60
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/61 b/rt/avail/mf/Core9/package/61
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/61
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/62 b/rt/avail/mf/Core9/package/62
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/62
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/63 b/rt/avail/mf/Core9/package/63
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/63
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/64 b/rt/avail/mf/Core9/package/64
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/64
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/65 b/rt/avail/mf/Core9/package/65
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/65
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/66 b/rt/avail/mf/Core9/package/66
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/66
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/67 b/rt/avail/mf/Core9/package/67
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/67
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/68 b/rt/avail/mf/Core9/package/68
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/68
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/69 b/rt/avail/mf/Core9/package/69
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/69
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/7 b/rt/avail/mf/Core9/package/7
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/7
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/70 b/rt/avail/mf/Core9/package/70
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/70
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/71 b/rt/avail/mf/Core9/package/71
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/71
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/72 b/rt/avail/mf/Core9/package/72
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/72
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/73 b/rt/avail/mf/Core9/package/73
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/73
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/74 b/rt/avail/mf/Core9/package/74
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/74
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/75 b/rt/avail/mf/Core9/package/75
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/75
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/76 b/rt/avail/mf/Core9/package/76
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/76
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/77 b/rt/avail/mf/Core9/package/77
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/77
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/78 b/rt/avail/mf/Core9/package/78
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/78
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/79 b/rt/avail/mf/Core9/package/79
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/79
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/8 b/rt/avail/mf/Core9/package/8
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/8
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/80 b/rt/avail/mf/Core9/package/80
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/80
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/81 b/rt/avail/mf/Core9/package/81
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/81
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/82 b/rt/avail/mf/Core9/package/82
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/82
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/83 b/rt/avail/mf/Core9/package/83
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/83
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/84 b/rt/avail/mf/Core9/package/84
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/84
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/85 b/rt/avail/mf/Core9/package/85
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/85
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/86 b/rt/avail/mf/Core9/package/86
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/86
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/87 b/rt/avail/mf/Core9/package/87
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/87
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/88 b/rt/avail/mf/Core9/package/88
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/88
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/89 b/rt/avail/mf/Core9/package/89
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/89
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/9 b/rt/avail/mf/Core9/package/9
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/9
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/90 b/rt/avail/mf/Core9/package/90
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/90
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/91 b/rt/avail/mf/Core9/package/91
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/91
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/92 b/rt/avail/mf/Core9/package/92
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/92
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/93 b/rt/avail/mf/Core9/package/93
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/93
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/94 b/rt/avail/mf/Core9/package/94
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/94
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/95 b/rt/avail/mf/Core9/package/95
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/95
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/96 b/rt/avail/mf/Core9/package/96
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/96
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/97 b/rt/avail/mf/Core9/package/97
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/97
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/98 b/rt/avail/mf/Core9/package/98
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/98
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/99 b/rt/avail/mf/Core9/package/99
new file mode 100644
index 000000000..a94193101
--- /dev/null
+++ b/rt/avail/mf/Core9/package/99
@@ -0,0 +1 @@
+junk
diff --git a/rt/avail/mf/Core9/package/package.lua b/rt/avail/mf/Core9/package/package.lua
new file mode 100644
index 000000000..e69de29bb
diff --git a/rt/avail/out.txt b/rt/avail/out.txt
index cfa4a104f..e7815cb34 100644
--- a/rt/avail/out.txt
+++ b/rt/avail/out.txt
@@ -362,3 +362,32 @@ MODULEPATH=ProjectDIR/rt/avail/mf/Core7;
 export MODULEPATH;
 _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={A={fn="ProjectDIR/rt/avail/mf/Core7/A/1.2",fullName="A/1.2",loadOrder=1,propT={},stackDepth=0,status="active",userName="A",wV="000000001.000000002.*zfinal",},B={fn="ProjectDIR/rt/avail/mf/Core7/B/1.0.lua",fullName="B/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="B",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/avail/mf/Core7",},}';
 export _ModuleTable_;
+===========================
+step 37
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing use ProjectDIR/rt/avail/mf/Core8
+===========================
+__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/avail/mf/Core8:1\;ProjectDIR/rt/avail/mf/Core7:1;
+export __LMOD_REF_COUNT_MODULEPATH;
+MODULEPATH=ProjectDIR/rt/avail/mf/Core8:ProjectDIR/rt/avail/mf/Core7;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={A={fn="ProjectDIR/rt/avail/mf/Core7/A/1.2",fullName="A/1.2",loadOrder=1,propT={},stackDepth=0,status="active",userName="A",wV="000000001.000000002.*zfinal",},B={fn="ProjectDIR/rt/avail/mf/Core7/B/1.0.lua",fullName="B/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="B",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/avail/mf/Core8","ProjectDIR/rt/avail/mf/Core7",},}';
+export _ModuleTable_;
+===========================
+step 38
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing avail
+===========================
+MODULEPATH=ProjectDIR/rt/avail/mf/Core8:ProjectDIR/rt/avail/mf/Core7;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={A={fn="ProjectDIR/rt/avail/mf/Core7/A/1.2",fullName="A/1.2",loadOrder=1,propT={},stackDepth=0,status="active",userName="A",wV="000000001.000000002.*zfinal",},B={fn="ProjectDIR/rt/avail/mf/Core7/B/1.0.lua",fullName="B/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="B",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/avail/mf/Core8","ProjectDIR/rt/avail/mf/Core7",},}';
+export _ModuleTable_;
+===========================
+step 39
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing use ProjectDIR/rt/avail/mf/Core9
+===========================
+__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/avail/mf/Core9:1\;ProjectDIR/rt/avail/mf/Core8:1\;ProjectDIR/rt/avail/mf/Core7:1;
+export __LMOD_REF_COUNT_MODULEPATH;
+MODULEPATH=ProjectDIR/rt/avail/mf/Core9:ProjectDIR/rt/avail/mf/Core8:ProjectDIR/rt/avail/mf/Core7;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={A={fn="ProjectDIR/rt/avail/mf/Core7/A/1.2",fullName="A/1.2",loadOrder=1,propT={},stackDepth=0,status="active",userName="A",wV="000000001.000000002.*zfinal",},B={fn="ProjectDIR/rt/avail/mf/Core7/B/1.0.lua",fullName="B/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="B",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/avail/mf/Core9","ProjectDIR/rt/avail/mf/Core8","ProjectDIR/rt/avail/mf/Core7",},}';
+export _ModuleTable_;
+false
diff --git a/rt/bioContainers/err.txt b/rt/bioContainers/err.txt
index e911b1f93..9e793a4a3 100644
--- a/rt/bioContainers/err.txt
+++ b/rt/bioContainers/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 2
@@ -24,8 +24,11 @@ step 4
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing -T avail
 ===========================
 running: module --regression_testing -T avail
+  Using Cache file: OutputDIR/bcd/cacheDir/spiderT.lua
   Building Spider cache for the following dir(s): ProjectDIR/rt/bioContainers/mf/Core
-Spider Loading: bioContainers/0.1 (fn: ProjectDIR/rt/bioContainers/mf/Core/bioContainers/0.1.lua)
+  Full spider search on ProjectDIR/rt/bioContainers/mf/Core
+  Spider Loading:       bioContainers/0.1 (fn: ProjectDIR/rt/bioContainers/mf/Core/bioContainers/0.1.lua)
+  dynamic spider search on ProjectDIR/rt/bioContainers/bcd/mf
   completed building cache. Saving cache: false
 ProjectDIR/rt/bioContainers/bcd/mf
    eagle/ctr-0.9.0--py34_0
diff --git a/rt/common_funcs.sh b/rt/common_funcs.sh
index 2dd40fb85..f763b5113 100644
--- a/rt/common_funcs.sh
+++ b/rt/common_funcs.sh
@@ -56,7 +56,7 @@ cleanUp ()
        -e "s|;$PATH_to_SHA1:[0-9];|;|g"                   \
        -e "s| $PATH_to_SHA1||g"                           \
        -e "s|\\\;$PATH_to_SHA1:[0-9]\\\;|\\\;|g"          \
-       -e "s|^Lmod version.*||g"                          \
+       -e "s|^ *Lmod version.*||g"                        \
        -e "s|^LMOD_LD_PRELOAD.*||g"                       \
        -e "s|^LuaFileSystem version.*||g"                 \
        -e "s|^Lua Version.*||g"                           \
diff --git a/rt/configDir/err.txt b/rt/configDir/err.txt
index de6a0da75..58fd1247f 100644
--- a/rt/configDir/err.txt
+++ b/rt/configDir/err.txt
@@ -2,13 +2,13 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 2
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --config
 ===========================
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 Description                        Value
 Allow root to use Lmod             yes
@@ -22,6 +22,7 @@ Disable Same Name AutoSwap         no
 Display Extension w/ avail         yes
 Using dotfiles                     yes
 Allow duplicate paths              no
+Dynamic Spider Cache               yes
 Require Exact Match/no defaults    no
 Export the module command          yes
 Allow extended default             yes
diff --git a/rt/dynamic_spider/dynamic_spider.tdesc b/rt/dynamic_spider/dynamic_spider.tdesc
new file mode 100644
index 000000000..ddfe4522f
--- /dev/null
+++ b/rt/dynamic_spider/dynamic_spider.tdesc
@@ -0,0 +1,102 @@
+-- -*- lua -*-
+local testName = "dynamic_spider"
+
+testdescript = {
+   owner   = "rtm",
+   product = "modules",
+   description = [[
+	dynamic_spider
+   ]],
+   keywords = {testName },
+
+   active   = true,
+   testName = testName,
+   job_submit_method = "INTERACTIVE",
+
+   runScript = [[
+
+     . $(projectDir)/rt/common_funcs.sh
+
+     unsetMT
+     initStdEnvVars
+     export MODULEPATH_ROOT=$(testDir)/mf
+     export MODULEPATH=$MODULEPATH_ROOT/Core
+
+     rm -fr _stderr.* _stdout.* err.* out.* .lmod.d myModules{,2,4}
+
+     runLmod --version                         # 1
+     runLmod spider                            # 2
+     mkdir -p $HOME/.lmod.d/.cache
+     buildSpiderT $MODULEPATH > $HOME/.lmod.d/.cache/spiderT.lua
+     runLmod spider                            # 3
+
+     cp -r ../../myModules .
+     runLmod spider                            # 4
+
+
+     unsetMT
+     export MODULEPATH_ROOT=$(testDir)/mf2
+     export MODULEPATH=$MODULEPATH_ROOT/Core
+
+     buildSpiderT $MODULEPATH > $HOME/.lmod.d/.cache/spiderT.lua
+     runLmod spider                            # 5
+
+     cp -r ../../myModules .
+     runLmod spider                            # 6
+
+     unsetMT
+     export MODULEPATH_ROOT=$(testDir)/mf3
+     export MODULEPATH=$MODULEPATH_ROOT/Core
+     rm -rf myModules
+
+     buildSpiderT $MODULEPATH > $HOME/.lmod.d/.cache/spiderT.lua
+     runLmod spider                            # 7
+
+     cp -r ../../myModules2 .
+     runLmod spider                            # 8
+
+     unsetMT
+     export MODULEPATH_ROOT=$(testDir)/mf4
+     export MODULEPATH=$MODULEPATH_ROOT/Core
+     rm -rf myModules2
+
+     buildSpiderT $MODULEPATH > $HOME/.lmod.d/.cache/spiderT.lua
+     runLmod --terse spider                    # 9
+
+     ############################################################
+     # Find user modulefiles
+     cp -r ../../myModules4 .
+     runLmod --terse spider                    #10
+
+     ############################################################
+     # Don't find user modulefiles because dynamic spider cache is off.
+     export LMOD_DYNAMIC_SPIDER_CACHE=No
+     runLmod --terse spider                    #11
+
+     runLmod load gcc/9.3.0                    #12
+     runLmod --terse spider                    #13
+
+     HOME=$ORIG_HOME
+     cat _stdout.[0-9][0-9][0-9] > _stdout.orig
+     joinBase64Results  -bash  _stdout.orig _stdout.new
+     cleanUp _stdout.new out.txt
+
+     cat _stderr.[0-9][0-9][0-9] > _stderr.orig
+     cleanUp _stderr.orig err.txt
+
+     rm -f results.csv
+     wrapperDiff --csv results.csv $(testDir)/out.txt out.txt
+     wrapperDiff --csv results.csv $(testDir)/err.txt err.txt
+     testFinish -r $(resultFn) -t $(runtimeFn) results.csv
+   ]],
+
+
+   blessScript = [[
+         # perform what is needed
+   ]],
+
+   tests = {
+      { id='t1'},
+   },
+
+}
diff --git a/rt/dynamic_spider/err.txt b/rt/dynamic_spider/err.txt
new file mode 100644
index 000000000..8cc081e13
--- /dev/null
+++ b/rt/dynamic_spider/err.txt
@@ -0,0 +1,150 @@
+===========================
+step 1
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
+===========================
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
+    by Robert McLay mclay@tacc.utexas.edu
+===========================
+step 2
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+The following is a list of the modules and extensions currently available:
+  A: A/1.0
+  B: B/1.0
+  gcc: gcc/9.3.0
+To learn more about a package execute:
+   $ module spider Foo
+where "Foo" is the name of a module.
+To find detailed information about a particular package you
+must specify the version if there is more than one version:
+   $ module spider Foo/11.1
+===========================
+step 3
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+The following is a list of the modules and extensions currently available:
+  A: A/1.0
+  B: B/1.0
+  gcc: gcc/9.3.0
+To learn more about a package execute:
+   $ module spider Foo
+where "Foo" is the name of a module.
+To find detailed information about a particular package you
+must specify the version if there is more than one version:
+   $ module spider Foo/11.1
+===========================
+step 4
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+The following is a list of the modules and extensions currently available:
+  A: A/1.0, A/2.0
+  B: B/1.0
+  D: D/3.0
+  gcc: gcc/9.3.0
+To learn more about a package execute:
+   $ module spider Foo
+where "Foo" is the name of a module.
+To find detailed information about a particular package you
+must specify the version if there is more than one version:
+   $ module spider Foo/11.1
+===========================
+step 5
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+The following is a list of the modules and extensions currently available:
+  A: A/2.0
+  D: D/3.0
+  gcc: gcc/9.3.0
+To learn more about a package execute:
+   $ module spider Foo
+where "Foo" is the name of a module.
+To find detailed information about a particular package you
+must specify the version if there is more than one version:
+   $ module spider Foo/11.1
+===========================
+step 6
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+The following is a list of the modules and extensions currently available:
+  A: A/2.0
+  D: D/3.0
+  gcc: gcc/9.3.0
+To learn more about a package execute:
+   $ module spider Foo
+where "Foo" is the name of a module.
+To find detailed information about a particular package you
+must specify the version if there is more than one version:
+   $ module spider Foo/11.1
+===========================
+step 7
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+The following is a list of the modules and extensions currently available:
+  StdEnv: StdEnv
+To learn more about a package execute:
+   $ module spider Foo
+where "Foo" is the name of a module.
+To find detailed information about a particular package you
+must specify the version if there is more than one version:
+   $ module spider Foo/11.1
+===========================
+step 8
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+The following is a list of the modules and extensions currently available:
+  StdEnv: StdEnv
+  gsl: gsl/1.27
+  tcc: tcc/4.0
+To learn more about a package execute:
+   $ module spider Foo
+where "Foo" is the name of a module.
+To find detailed information about a particular package you
+must specify the version if there is more than one version:
+   $ module spider Foo/11.1
+===========================
+step 9
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --terse spider
+===========================
+gcc/
+gcc/9.3.0
+gcc/10.3.0
+gsl/
+gsl/1.16
+gsl/2.6
+===========================
+step 10
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --terse spider
+===========================
+gcc/
+gcc/9.3.0
+gcc/10.3.0
+gsl/
+gsl/1.16
+gsl/2.6
+gsl/2.7
+gsl/2.8
+===========================
+step 11
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --terse spider
+===========================
+gcc/
+gcc/9.3.0
+gcc/10.3.0
+gsl/
+gsl/1.16
+gsl/2.6
+===========================
+step 12
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing load gcc/9.3.0
+===========================
+===========================
+step 13
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --terse spider
+===========================
+gcc/
+gcc/9.3.0
+gcc/10.3.0
+gsl/
+gsl/1.16
+gsl/2.6
+gsl/2.7
diff --git a/rt/dynamic_spider/mf/Compiler/gcc/9/A/1.0.lua b/rt/dynamic_spider/mf/Compiler/gcc/9/A/1.0.lua
new file mode 100644
index 000000000..71d32cb87
--- /dev/null
+++ b/rt/dynamic_spider/mf/Compiler/gcc/9/A/1.0.lua
@@ -0,0 +1 @@
+setenv("VERSION",myModuleVersion())
diff --git a/rt/dynamic_spider/mf/Compiler/gcc/9/B/1.0.lua b/rt/dynamic_spider/mf/Compiler/gcc/9/B/1.0.lua
new file mode 100644
index 000000000..71d32cb87
--- /dev/null
+++ b/rt/dynamic_spider/mf/Compiler/gcc/9/B/1.0.lua
@@ -0,0 +1 @@
+setenv("VERSION",myModuleVersion())
diff --git a/rt/dynamic_spider/mf/Core/gcc/9.3.0.lua b/rt/dynamic_spider/mf/Core/gcc/9.3.0.lua
new file mode 100644
index 000000000..cf84860ef
--- /dev/null
+++ b/rt/dynamic_spider/mf/Core/gcc/9.3.0.lua
@@ -0,0 +1,11 @@
+local pkgVersion = "9"
+local pkgName    = myModuleName()
+local mroot = os.getenv("MODULEPATH_ROOT")
+local cmplr = pathJoin("Compiler",pkgName,pkgVersion)
+prepend_path("MODULEPATH",pathJoin(mroot,cmplr))
+
+local hroot   = pathJoin(os.getenv("HOME") or "","myModules")
+local userDir = pathJoin(hroot,cmplr)
+if (isDir(userDir)) then
+   prepend_path("MODULEPATH",userDir)
+end
diff --git a/rt/dynamic_spider/mf2/Core/gcc/9.3.0.lua b/rt/dynamic_spider/mf2/Core/gcc/9.3.0.lua
new file mode 100644
index 000000000..926342839
--- /dev/null
+++ b/rt/dynamic_spider/mf2/Core/gcc/9.3.0.lua
@@ -0,0 +1,12 @@
+local pkgVersion = "9"
+local pkgName    = myModuleName()
+local cmplr      = pathJoin("Compiler",pkgName,pkgVersion)
+local hroot      = pathJoin(os.getenv("HOME") or "","myModules")
+local userDir    = pathJoin(hroot,cmplr)
+
+haveDynamicMPATH()
+
+if (isDir(userDir)) then
+   prepend_path("MODULEPATH",userDir)
+end
+   
diff --git a/rt/dynamic_spider/mf3/Core/StdEnv.lua b/rt/dynamic_spider/mf3/Core/StdEnv.lua
new file mode 100644
index 000000000..19feaae76
--- /dev/null
+++ b/rt/dynamic_spider/mf3/Core/StdEnv.lua
@@ -0,0 +1,6 @@
+local hroot   = pathJoin(os.getenv("HOME") or "","myModules2")
+local userDir = pathJoin(hroot,"Core")
+if (isDir(userDir)) then
+   prepend_path("MODULEPATH",userDir)
+end
+haveDynamicMPATH()
diff --git a/rt/dynamic_spider/mf4/Compiler/gcc9/gsl/1.16.lua b/rt/dynamic_spider/mf4/Compiler/gcc9/gsl/1.16.lua
new file mode 100644
index 000000000..9806dd0fc
--- /dev/null
+++ b/rt/dynamic_spider/mf4/Compiler/gcc9/gsl/1.16.lua
@@ -0,0 +1,2 @@
+conflict("gsl")
+setenv("EBVERSIONGSL", myModuleVersion())
diff --git a/rt/dynamic_spider/mf4/Compiler/gcc9/gsl/2.6.lua b/rt/dynamic_spider/mf4/Compiler/gcc9/gsl/2.6.lua
new file mode 100644
index 000000000..9806dd0fc
--- /dev/null
+++ b/rt/dynamic_spider/mf4/Compiler/gcc9/gsl/2.6.lua
@@ -0,0 +1,2 @@
+conflict("gsl")
+setenv("EBVERSIONGSL", myModuleVersion())
diff --git a/rt/dynamic_spider/mf4/Core/gcc/10.3.0.lua b/rt/dynamic_spider/mf4/Core/gcc/10.3.0.lua
new file mode 100644
index 000000000..5d652364e
--- /dev/null
+++ b/rt/dynamic_spider/mf4/Core/gcc/10.3.0.lua
@@ -0,0 +1,9 @@
+local mroot = myFileName():match('(.*)/Core/gcc')
+prepend_path("MODULEPATH", pathJoin(mroot, "Compiler/gcc10"))
+local hroot   = pathJoin(os.getenv("HOME") or "","myModules4")
+local userDir = pathJoin(hroot,"Compiler/gcc10")
+if (isDir(userDir)) then
+   prepend_path("MODULEPATH",userDir)
+end
+
+family("compiler")
diff --git a/rt/dynamic_spider/mf4/Core/gcc/9.3.0.lua b/rt/dynamic_spider/mf4/Core/gcc/9.3.0.lua
new file mode 100644
index 000000000..fdbec0a96
--- /dev/null
+++ b/rt/dynamic_spider/mf4/Core/gcc/9.3.0.lua
@@ -0,0 +1,9 @@
+local mroot = myFileName():match('(.*)/Core/gcc')
+prepend_path("MODULEPATH", pathJoin(mroot, "Compiler/gcc9"))
+local hroot   = pathJoin(os.getenv("HOME") or "","myModules4")
+local userDir = pathJoin(hroot,"Compiler/gcc9")
+if (isDir(userDir)) then
+   prepend_path("MODULEPATH",userDir)
+end
+
+family("compiler")
diff --git a/rt/dynamic_spider/myModules/Compiler/gcc/9/A/2.0.lua b/rt/dynamic_spider/myModules/Compiler/gcc/9/A/2.0.lua
new file mode 100644
index 000000000..a92a7f693
--- /dev/null
+++ b/rt/dynamic_spider/myModules/Compiler/gcc/9/A/2.0.lua
@@ -0,0 +1 @@
+setenv("MODULEPATH",myModuleVersion())
diff --git a/rt/dynamic_spider/myModules/Compiler/gcc/9/D/3.0.lua b/rt/dynamic_spider/myModules/Compiler/gcc/9/D/3.0.lua
new file mode 100644
index 000000000..a92a7f693
--- /dev/null
+++ b/rt/dynamic_spider/myModules/Compiler/gcc/9/D/3.0.lua
@@ -0,0 +1 @@
+setenv("MODULEPATH",myModuleVersion())
diff --git a/rt/dynamic_spider/myModules2/Compiler/tcc/4/gsl/1.27.lua b/rt/dynamic_spider/myModules2/Compiler/tcc/4/gsl/1.27.lua
new file mode 100644
index 000000000..23a20c960
--- /dev/null
+++ b/rt/dynamic_spider/myModules2/Compiler/tcc/4/gsl/1.27.lua
@@ -0,0 +1 @@
+setenv("MY_VERSION", myModuleVersion())
diff --git a/rt/dynamic_spider/myModules2/Core/tcc/4.0.lua b/rt/dynamic_spider/myModules2/Core/tcc/4.0.lua
new file mode 100644
index 000000000..848992c44
--- /dev/null
+++ b/rt/dynamic_spider/myModules2/Core/tcc/4.0.lua
@@ -0,0 +1,9 @@
+local pkgVersion = "4"
+local pkgName    = myModuleName()
+local TEST_root = myFileName():match( '(.*)/Core/tcc/.*' )
+local userDir   = pathJoin(TEST_root,"Compiler",pkgName, pkgVersion)
+
+if (isDir(userDir)) then
+   prepend_path("MODULEPATH",userDir)
+end
+
diff --git a/rt/dynamic_spider/myModules4/Compiler/gcc10/gsl/2.8.lua b/rt/dynamic_spider/myModules4/Compiler/gcc10/gsl/2.8.lua
new file mode 100644
index 000000000..5a4a554a4
--- /dev/null
+++ b/rt/dynamic_spider/myModules4/Compiler/gcc10/gsl/2.8.lua
@@ -0,0 +1 @@
+setenv("EBVERSIONGSL", myModuleVersion())
diff --git a/rt/dynamic_spider/myModules4/Compiler/gcc9/gsl/2.7.lua b/rt/dynamic_spider/myModules4/Compiler/gcc9/gsl/2.7.lua
new file mode 100644
index 000000000..5a4a554a4
--- /dev/null
+++ b/rt/dynamic_spider/myModules4/Compiler/gcc9/gsl/2.7.lua
@@ -0,0 +1 @@
+setenv("EBVERSIONGSL", myModuleVersion())
diff --git a/rt/dynamic_spider/out.txt b/rt/dynamic_spider/out.txt
new file mode 100644
index 000000000..71fd9bfd6
--- /dev/null
+++ b/rt/dynamic_spider/out.txt
@@ -0,0 +1,118 @@
+===========================
+step 1
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
+===========================
+===========================
+step 2
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/dynamic_spider/mf/Core:1;
+export __LMOD_REF_COUNT_MODULEPATH;
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf/Core",}';
+export _ModuleTable_;
+===========================
+step 3
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf/Core",}';
+export _ModuleTable_;
+===========================
+step 4
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf/Core",}';
+export _ModuleTable_;
+===========================
+step 5
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/dynamic_spider/mf2/Core:1;
+export __LMOD_REF_COUNT_MODULEPATH;
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf2/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf2/Core",}';
+export _ModuleTable_;
+===========================
+step 6
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf2/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf2/Core",}';
+export _ModuleTable_;
+===========================
+step 7
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/dynamic_spider/mf3/Core:1;
+export __LMOD_REF_COUNT_MODULEPATH;
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf3/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf3/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf3/Core",}';
+export _ModuleTable_;
+===========================
+step 8
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf3/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf3/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf3/Core",}';
+export _ModuleTable_;
+===========================
+step 9
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --terse spider
+===========================
+__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/dynamic_spider/mf4/Core:1;
+export __LMOD_REF_COUNT_MODULEPATH;
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf4/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf4/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf4/Core",}';
+export _ModuleTable_;
+===========================
+step 10
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --terse spider
+===========================
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf4/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf4/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf4/Core",}';
+export _ModuleTable_;
+===========================
+step 11
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --terse spider
+===========================
+MODULEPATH=ProjectDIR/rt/dynamic_spider/mf4/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/dynamic_spider/mf4/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf4/Core",}';
+export _ModuleTable_;
+===========================
+step 12
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing load gcc/9.3.0
+===========================
+LMOD_FAMILY_COMPILER=gcc;
+export LMOD_FAMILY_COMPILER;
+LMOD_FAMILY_COMPILER_VERSION=9.3.0;
+export LMOD_FAMILY_COMPILER_VERSION;
+LOADEDMODULES=gcc/9.3.0;
+export LOADEDMODULES;
+__LMOD_REF_COUNT_MODULEPATH=OutputDIR/myModules4/Compiler/gcc9:1\;ProjectDIR/rt/dynamic_spider/mf4/Compiler/gcc9:1\;ProjectDIR/rt/dynamic_spider/mf4/Core:1;
+export __LMOD_REF_COUNT_MODULEPATH;
+MODULEPATH=OutputDIR/myModules4/Compiler/gcc9:ProjectDIR/rt/dynamic_spider/mf4/Compiler/gcc9:ProjectDIR/rt/dynamic_spider/mf4/Core;
+export MODULEPATH;
+_LMFILES_=ProjectDIR/rt/dynamic_spider/mf4/Core/gcc/9.3.0.lua;
+export _LMFILES_;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={compiler="gcc",},mT={gcc={fn="ProjectDIR/rt/dynamic_spider/mf4/Core/gcc/9.3.0.lua",fullName="gcc/9.3.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="gcc/9.3.0",wV="000000009.000000003.*zfinal",},},mpathA={"OutputDIR/myModules4/Compiler/gcc9","ProjectDIR/rt/dynamic_spider/mf4/Compiler/gcc9","ProjectDIR/rt/dynamic_spider/mf4/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf4/Core",}';
+export _ModuleTable_;
+===========================
+step 13
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing --terse spider
+===========================
+MODULEPATH=OutputDIR/myModules4/Compiler/gcc9:ProjectDIR/rt/dynamic_spider/mf4/Compiler/gcc9:ProjectDIR/rt/dynamic_spider/mf4/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={compiler="gcc",},mT={gcc={fn="ProjectDIR/rt/dynamic_spider/mf4/Core/gcc/9.3.0.lua",fullName="gcc/9.3.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="gcc/9.3.0",wV="000000009.000000003.*zfinal",},},mpathA={"OutputDIR/myModules4/Compiler/gcc9","ProjectDIR/rt/dynamic_spider/mf4/Compiler/gcc9","ProjectDIR/rt/dynamic_spider/mf4/Core",},systemBaseMPATH="ProjectDIR/rt/dynamic_spider/mf4/Core",}';
+export _ModuleTable_;
diff --git a/rt/help/err.txt b/rt/help/err.txt
index bbb17cda3..f35a02342 100644
--- a/rt/help/err.txt
+++ b/rt/help/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 2
@@ -22,7 +22,7 @@ Options:
   -t --terse                        Write out in machine readable format for commands: list, avail, spider, savelist
   --initial_load                    loading Lmod for first time in a user shell
   --latest                          Load latest (ignore default)
-  --ignore_cache                    Treat the cache file(s) as out-of-date
+  -I --ignore_cache                 Treat the cache file(s) as out-of-date
   --novice                          Turn off expert and quiet flag
   --raw                             Print modulefile in raw output when used with show
   -w twidth --width=twidth          Use this as max term width
@@ -103,7 +103,7 @@ Lmod Web Sites
   SourceForge:      https://lmod.sf.net
   TACC Homepage:    https://www.tacc.utexas.edu/research-development/tacc-projects/lmod
   To report a bug please read http://lmod.readthedocs.io/en/latest/075_bug_reporting.html
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 3
@@ -123,7 +123,7 @@ Options:
   -t --terse                        Write out in machine readable format for commands: list, avail, spider, savelist
   --initial_load                    loading Lmod for first time in a user shell
   --latest                          Load latest (ignore default)
-  --ignore_cache                    Treat the cache file(s) as out-of-date
+  -I --ignore_cache                 Treat the cache file(s) as out-of-date
   --novice                          Turn off expert and quiet flag
   --raw                             Print modulefile in raw output when used with show
   -w twidth --width=twidth          Use this as max term width
@@ -204,7 +204,7 @@ Lmod Web Sites
   SourceForge:      https://lmod.sf.net
   TACC Homepage:    https://www.tacc.utexas.edu/research-development/tacc-projects/lmod
   To report a bug please read http://lmod.readthedocs.io/en/latest/075_bug_reporting.html
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 4
@@ -224,7 +224,7 @@ Version 9
 step 5
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --config
 ===========================
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 Description                        Value
 Allow root to use Lmod             yes
@@ -238,6 +238,7 @@ Disable Same Name AutoSwap         no
 Display Extension w/ avail         yes
 Using dotfiles                     yes
 Allow duplicate paths              no
+Dynamic Spider Cache               yes
 Require Exact Match/no defaults    no
 Export the module command          yes
 Allow extended default             yes
diff --git a/rt/i18n/err.txt b/rt/i18n/err.txt
index 47cee36fe..208c0db18 100644
--- a/rt/i18n/err.txt
+++ b/rt/i18n/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 2
@@ -64,7 +64,7 @@ Options:
   -t --terse                        Affichage dans un format lisible par l'ordinateur pour les commandes: list, avail, spider, savelist
   --initial_load                    Chargement de Lmod pour la première fois dans une session d'usager
   --latest                          Charge la version la plus récente (ignore la version par défaut)
-  --ignore_cache                    Considère la cache comme étant désuète
+  -I --ignore_cache                 Considère la cache comme étant désuète
   --novice                          Désactive le mode expert
   --raw                             Lorsqu'utilisé avec la sous-commande show, affiche le contenu du fichier de module de façon non formattée
   -w twidth --width=twidth          Change la largeur de l'affichage
@@ -145,5 +145,5 @@ Sites web de Lmod
   SourceForge:      https://lmod.sf.net
   TACC Homepage:    https://www.tacc.utexas.edu/research-development/tacc-projects/lmod
   Pour rapporter un bogue, veuillez lire http://lmod.readthedocs.io/en/latest/075_bug_reporting.html
-Modules based on Lua: Version 8.6.9  2022-02-02 11:25 -04:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
diff --git a/rt/rmap/err.txt b/rt/rmap/err.txt
index c408a2dc8..71f76ba3a 100644
--- a/rt/rmap/err.txt
+++ b/rt/rmap/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.6.14  2022-02-25 21:25 -06:00
+Modules based on Lua: Version 8.7.2  2022-05-04 13:42 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 2
diff --git a/rt/rmap/out.txt b/rt/rmap/out.txt
index 31ef897c6..ec1eb74c3 100644
--- a/rt/rmap/out.txt
+++ b/rt/rmap/out.txt
@@ -25,6 +25,7 @@ spiderT = {
         ["impi/4.1"] = {
           Version = "4.1",
           canonical = "4.1",
+          changeMPATH = true,
           family = "MPI",
           fn = "ProjectDIR/rt/rmap/mf/Compiler/intel/13.1/impi/4.1.lua",
           lpathA = {
@@ -50,6 +51,7 @@ spiderT = {
         ["impi/4.1"] = {
           Version = "4.1",
           canonical = "4.1",
+          changeMPATH = true,
           family = "MPI",
           fn = "ProjectDIR/rt/rmap/mf/Compiler/intel/14.0/impi/4.1.lua",
           lpathA = {
@@ -75,6 +77,7 @@ spiderT = {
         ["intel/13.1"] = {
           Version = "13.1",
           canonical = "13.1",
+          changeMPATH = true,
           family = "compiler",
           fn = "ProjectDIR/rt/rmap/mf/Core/intel/13.1.lua",
           lpathA = {
@@ -91,6 +94,7 @@ spiderT = {
         ["intel/14.0.1"] = {
           Version = "14.0.1",
           canonical = "14.0.1",
+          changeMPATH = true,
           family = "compiler",
           fn = "ProjectDIR/rt/rmap/mf/Core/intel/14.0.1.lua",
           lpathA = {
@@ -357,6 +361,7 @@ spiderT = {
         ["impi/4.1"] = {
           Version = "4.1",
           canonical = "4.1",
+          changeMPATH = true,
           family = "MPI",
           fn = "ProjectDIR/rt/rmap/mf/2Compiler/intel/14.0/impi/4.1.lua",
           lpathA = {
@@ -382,6 +387,7 @@ spiderT = {
         ["intel/14.0.1"] = {
           Version = "14.0.1",
           canonical = "14.0.1",
+          changeMPATH = true,
           family = "compiler",
           fn = "ProjectDIR/rt/rmap/mf/2Core/intel/14.0.1.lua",
           lpathA = {
@@ -513,6 +519,7 @@ spiderT = {
         ["impi/4.1"] = {
           Version = "4.1",
           canonical = "4.1",
+          changeMPATH = true,
           family = "MPI",
           fn = "ProjectDIR/rt/rmap/mf/2Compiler/intel/14.0/impi/4.1.lua",
           lpathA = {
@@ -538,6 +545,7 @@ spiderT = {
         ["intel/14.0.1"] = {
           Version = "14.0.1",
           canonical = "14.0.1",
+          changeMPATH = true,
           family = "compiler",
           fn = "ProjectDIR/rt/rmap/mf/2Core/intel/14.0.1.lua",
           lpathA = {
@@ -563,6 +571,7 @@ spiderT = {
         ["paraview/5.6"] = {
           Version = "5.6",
           canonical = "5.6",
+          changeMPATH = true,
           fn = "ProjectDIR/rt/rmap/mf/2MPI/intel/14.0/impi/4.1/paraview/5.6.lua",
           luaExt = 4,
           mpath = "ProjectDIR/rt/rmap/mf/2MPI/intel/14.0/impi/4.1",
diff --git a/rt/spider/err.txt b/rt/spider/err.txt
index 10082480e..14e9700f7 100644
--- a/rt/spider/err.txt
+++ b/rt/spider/err.txt
@@ -2,7 +2,7 @@
 step 1
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing --version
 ===========================
-Modules based on Lua: Version 8.7.2  2022-05-04 13:42 -05:00
+Modules based on Lua: Version 8.7.3  2022-05-23 14:19 -05:00
     by Robert McLay mclay@tacc.utexas.edu
 ===========================
 step 2
@@ -884,6 +884,21 @@ lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider GROMACS/2019
        - Homepage: http://www.gromacs.org
 ===========================
 step 71
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+The following is a list of the modules and extensions currently available:
+  gcc: gcc/10.1
+  GROMACS: GROMACS/2018, GROMACS/2019
+    GROMACS(CPU/2018) is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles. This is a CPU enabled build, containing both MPI and threadMPI binaries for 2018.
+  zuda: zuda/10.1
+To learn more about a package execute:
+   $ module spider Foo
+where "Foo" is the name of a module.
+To find detailed information about a particular package you
+must specify the version if there is more than one version:
+   $ module spider Foo/11.1
+===========================
+step 72
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing avail
 ===========================
 Global Aliases
@@ -900,7 +915,7 @@ If the avail list is too long consider trying:
 Use "module spider" to find all possible modules and extensions.
 Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys".
 ===========================
-step 72
+step 73
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider Appl1
 ===========================
   Appl1: Appl1/1
@@ -908,7 +923,7 @@ lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider Appl1
       init-cluster/1.0  MyStack/2021
       init-cluster/1.0  MyStack/2022
 ===========================
-step 73
+step 74
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider Appl1
 ===========================
   Appl1: Appl1/1
diff --git a/rt/spider/out.txt b/rt/spider/out.txt
index e60791447..7192360ab 100644
--- a/rt/spider/out.txt
+++ b/rt/spider/out.txt
@@ -330,6 +330,7 @@ spiderT = {
         ["gcc/4.2.3"] = {
           Version = "4.2.3",
           canonical = "4.2.3",
+          changeMPATH = true,
           family = "compiler",
           fn = "ProjectDIR/rt/spider/mf/E_Core/gcc/4.2.3.lua",
           luaExt = 6,
@@ -340,6 +341,7 @@ spiderT = {
         ["gcc/4.2.5"] = {
           Version = "4.2.5",
           canonical = "4.2.5",
+          changeMPATH = true,
           family = "compiler",
           fn = "ProjectDIR/rt/spider/mf/E_Core/gcc/4.2.5.lua",
           luaExt = 6,
@@ -357,6 +359,7 @@ spiderT = {
         ["intel/11.0"] = {
           Version = "11.0",
           canonical = "11.0",
+          changeMPATH = true,
           family = "compiler",
           fn = "ProjectDIR/rt/spider/mf/E_Core/intel/11.0.lua",
           help = [[        Intel Compilers
@@ -382,6 +385,7 @@ spiderT = {
         ["intel/11.2"] = {
           Version = "11.2",
           canonical = "11.2",
+          changeMPATH = true,
           family = "compiler",
           fn = "ProjectDIR/rt/spider/mf/E_Core/intel/11.2.lua",
           help = [[        Intel Compilers
@@ -1337,6 +1341,7 @@ This is a GPU only build, containing both MPI and threadMPI builds for 2019.
         ["gcc/10.1"] = {
           Version = "10.1",
           canonical = "10.1",
+          changeMPATH = true,
           fn = "ProjectDIR/rt/spider/mf2/Core/gcc/10.1.lua",
           luaExt = 5,
           mpath = "ProjectDIR/rt/spider/mf2/Core",
@@ -1353,6 +1358,7 @@ This is a GPU only build, containing both MPI and threadMPI builds for 2019.
         ["zuda/10.1"] = {
           Version = "10.1",
           canonical = "10.1",
+          changeMPATH = true,
           fn = "ProjectDIR/rt/spider/mf2/Core/zuda/10.1.lua",
           luaExt = 5,
           mpath = "ProjectDIR/rt/spider/mf2/Core",
@@ -1524,6 +1530,14 @@ _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"Pro
 export _ModuleTable_;
 ===========================
 step 71
+lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider
+===========================
+MODULEPATH=ProjectDIR/rt/spider/mf2/Core;
+export MODULEPATH;
+_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/spider/mf2/Core",},systemBaseMPATH="ProjectDIR/rt/spider/mf2/Core",}';
+export _ModuleTable_;
+===========================
+step 72
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing avail
 ===========================
 __LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/spider/mf3/system:1\;ProjectDIR/rt/spider/mf3/init-modules:1;
@@ -1533,7 +1547,7 @@ export MODULEPATH;
 _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/spider/mf3/system","ProjectDIR/rt/spider/mf3/init-modules",},systemBaseMPATH="ProjectDIR/rt/spider/mf3/system:ProjectDIR/rt/spider/mf3/init-modules",}';
 export _ModuleTable_;
 ===========================
-step 72
+step 73
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider Appl1
 ===========================
 MODULEPATH=ProjectDIR/rt/spider/mf3/system:ProjectDIR/rt/spider/mf3/init-modules;
@@ -1541,7 +1555,7 @@ export MODULEPATH;
 _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/spider/mf3/system","ProjectDIR/rt/spider/mf3/init-modules",},systemBaseMPATH="ProjectDIR/rt/spider/mf3/system:ProjectDIR/rt/spider/mf3/init-modules",}';
 export _ModuleTable_;
 ===========================
-step 73
+step 74
 lua ProjectDIR/src/lmod.in.lua bash --regression_testing spider Appl1
 ===========================
 MODULEPATH=ProjectDIR/rt/spider/mf3/system:ProjectDIR/rt/spider/mf3/init-modules;
diff --git a/rt/spider/spider.tdesc b/rt/spider/spider.tdesc
index 91941df72..c335754e8 100644
--- a/rt/spider/spider.tdesc
+++ b/rt/spider/spider.tdesc
@@ -141,6 +141,13 @@ testdescript = {
      runLmod      spider GROMACS/2018                                         #69
      runLmod      spider GROMACS/2019                                         #70
 
+     # Test writing of user cache
+
+     export LMOD_SHORT_TIME=0
+     rm $HOME/.lmod.d/.cache/*
+     runLmod      spider                                                      #71
+
+
      # Case from U. of Antwerp where spider failed when adding a 
      # path of itself to $MODULEPATH
 
@@ -151,14 +158,12 @@ testdescript = {
      unset LMOD_ADMIN_FILE
      unset LMOD_PACKAGE_PATH
 
-     runLmod avail                                                            #71
+     runLmod avail                                                            #72
 
      unset TRIGGER_BUG
-     runLmod spider Appl1                                                     #72
-     export TRIGGER_BUG=
      runLmod spider Appl1                                                     #73
-     
-
+     export TRIGGER_BUG=
+     runLmod spider Appl1                                                     #74
 
      HOME=$ORIG_HOME
 
diff --git a/spec/Spider/Spider_spec.lua b/spec/Spider/Spider_spec.lua
index 1a58b44fc..08257f774 100644
--- a/spec/Spider/Spider_spec.lua
+++ b/spec/Spider/Spider_spec.lua
@@ -29,9 +29,10 @@ describe("Testing Spider Class #Spider.",
 
                   local spider  = Spider:new()
                   local spiderT = {}
+                  local mpathMapT = {}
                   _G.mcp = MasterControl.build("spider")
                   _G.MCP = MasterControl.build("spider")
-                  spider:findAllModules({mpath}, spiderT)
+                  spider:findAllModules({mpath}, spiderT, mpathMapT)
                   local gold_spiderT = {
                      ["%ProjDir%/spec/Spider/mf/Core"]  = {
                         TACC = {
@@ -167,11 +168,12 @@ describe("Testing Spider Class #Spider.",
                   posix.setenv("LMOD_MAXDEPTH",   nil,        true)
                   cosmic:assign("LMOD_MAXDEPTH",  false)
 
-                  local spider = Spider:new()
-                  local spiderT = {}
+                  local spider    = Spider:new()
+                  local spiderT   = {}
+                  local mpathMapT = {}
                   _G.mcp = MasterControl.build("spider")
                   _G.MCP = MasterControl.build("spider")
-                  spider:findAllModules({mpath}, spiderT)
+                  spider:findAllModules({mpath}, spiderT, mpathMapT)
                   local gold_spiderT = {
                      ["%ProjDir%/spec/Spider/h/mf/Compiler/gcc/5.9"]  = {
                         mpich = {
@@ -182,6 +184,7 @@ describe("Testing Spider Class #Spider.",
                               ["mpich/17.200.3"]  = {
                                  ["Version"] = "17.200.3",
                                  ["canonical"] = "17.200.3",
+                                 ["changeMPATH"] = true,
                                  ["fn"] = "%ProjDir%/spec/Spider/h/mf/Compiler/gcc/5.9/mpich/17.200.3.lua",
                                  ["luaExt"] = 9,
                                  ["mpath"] = "%ProjDir%/spec/Spider/h/mf/Compiler/gcc/5.9",
@@ -225,6 +228,7 @@ describe("Testing Spider Class #Spider.",
                               ["gcc/5.9.2"]  = {
                                  ["Version"] = "5.9.2",
                                  ["canonical"] = "5.9.2",
+                                 ["changeMPATH"] = true,
                                  ["fn"] = "%ProjDir%/spec/Spider/h/mf/Core/gcc/5.9.2.lua",
                                  ["luaExt"] = 6,
                                  ["mpath"] = "%ProjDir%/spec/Spider/h/mf/Core",
diff --git a/src/Cache.lua b/src/Cache.lua
index 1e6d34489..cc418c789 100644
--- a/src/Cache.lua
+++ b/src/Cache.lua
@@ -274,8 +274,9 @@ end
 -- @return the number of directories read.
 local function l_readCacheFile(self, mpathA, spiderTFnA)
    dbg.start{"Cache l_readCacheFile(mpathA, spiderTFnA)"}
-   local dirsRead  = 0
+   local dirsRead     = 0
    local ignore_cache = cosmic:value("LMOD_IGNORE_CACHE")
+   local tracing      = cosmic:value("LMOD_TRACING")
    if (masterTbl().ignoreCache or ignore_cache) then
       dbg.print{"LMOD_IGNORE_CACHE is true\n"}
       dbg.fini("Cache l_readCacheFile")
@@ -308,7 +309,7 @@ local function l_readCacheFile(self, mpathA, spiderTFnA)
                found = true
                break
             else
-               dbg.print{"Did not find: ",fn,"\n"}
+               dbg.print{"Did not find:    ",fn,"\n"}
             end
          end
 
@@ -318,6 +319,9 @@ local function l_readCacheFile(self, mpathA, spiderTFnA)
          end
 
          dbg.print{"cacheFile found: ",fn,"\n"}
+         if (tracing == "yes") then  
+            tracing_msg{"Using Cache file: ",fn}
+         end
 
          -- Check Time
 
@@ -369,6 +373,114 @@ local function l_readCacheFile(self, mpathA, spiderTFnA)
    return dirsRead
 end
 
+--------------------------------------------------------------------------
+-- Write out spider cache to user space if it takes too much time.
+
+local function l_writeUserSpiderCacheWhenNecessary(self, delta_t, mpathA, spiderT, mpathMapT)
+   local doneMsg
+   local masterTbl = masterTbl()
+   local tracing   = cosmic:value("LMOD_TRACING")
+   local mrc       = MRC:singleton()
+   local frameStk  = FrameStk:singleton()
+   local mt        = frameStk:mt()
+   local short     = mt:getShortTime()
+   local threshold = cosmic:value("LMOD_THRESHOLD")
+   local prtRbMsg  = ((not quiet())                        and
+                      (not masterTbl.initial)              and
+                      ((not short) or (short > shortTime)) and
+                      (not self.quiet)
+                     )
+   local cTimer    = CTimer:singleton("Rebuilding cache, please wait ...",
+                                       threshold, prtRbMsg, masterTbl.timeout)
+   dbg.print{"short:    ", short,  ", shortTime: ", shortTime,"\n", level=2}
+   dbg.print{"quiet:    ", quiet(),", initial:   ", masterTbl.initial,"\n"}
+   dbg.print{"prtRbMsg: ",prtRbMsg,", quiet:     ",self.quiet,"\n"}
+
+   
+   local r = {}
+   hook.apply("writeCache",r)
+   
+   dbg.print{"self.dontWrite: ", self.dontWrite, ", r.dontWriteCache: ",
+                r.dontWriteCache, "\n"}
+
+   local dontWrite = self.dontWrite or r.dontWriteCache or cosmic:value("LMOD_IGNORE_CACHE")
+
+   if (tracing == "yes") then
+      tracing_msg{"completed building cache. Saving cache: ",
+                  tostring(not(delta_t < shortTime or dontWrite))}
+   end
+
+   if (delta_t < shortTime or dontWrite) then
+      ancient = shortLifeCache
+
+      ------------------------------------------------------------------------
+      -- This is a bit of a hack.  Lmod needs to know the time it takes to
+      -- build the cache and it needs to store it in the ModuleTable.  The
+      -- trouble is with regression testing.  The module table is only written
+      -- out when it value changes.  We do not want a new module written out
+      -- if the only thing that has changed is the slight variation that it
+      -- took to build the cache between Lmod command runs during a regression
+      -- test.  So if the previous t2-t1 is also less than shortTime DO NOT
+      -- reset short to the new value.
+
+      local newShortTime = delta_t
+      if (short and short < shortTime) then
+         newShortTime = short
+      end
+      mt:setRebuildTime(ancient, newShortTime)
+      dbg.print{"mt: ", tostring(mt), "\n", level=2}
+      doneMsg = " (not written to file) done"
+   else
+      local userSpiderTFN = self.usrSpiderTFN
+      mkdir_recursive(self.usrCacheDir)
+      local userSpiderTFN_new = userSpiderTFN .. "_" .. l_uuid()
+      local f                 = io.open(userSpiderTFN_new,"w")
+      if (f) then
+         os.rename(userSpiderTFN, userSpiderTFN .. "~")
+         local s0 = "-- Date: " .. os.date("%c",os.time()) .. "\n"
+         local s1 = "ancient = " .. tostring(math.floor(ancient)) .."\n"
+         local s2 = mrc:export()
+         local s3 = serializeTbl{name="spiderT",      value=spiderT,   indent=true}
+         local s4 = serializeTbl{name="mpathMapT",    value=mpathMapT, indent=true}
+         f:write(s0,s1,s2,s3,s4)
+         f:close()
+         local ok, msg = os.rename(userSpiderTFN_new, userSpiderTFN)
+         if (not ok) then
+            LmodError{msg="e_Unable_2_rename",from=userSpiderTFN_new,to=userSpiderTFN, errMsg=msg}
+         end
+         posix.unlink(userSpiderTFN .. "~")
+         dbg.print{"Wrote: ",userSpiderTFN,"\n"}
+      end
+      if (LUAC_PATH ~= "") then
+         if (LUAC_PATH:sub(1,1) == "@") then
+            LUAC_PATH="luac"
+         end
+         local ext = ".luac_"..LuaV
+         local fn = userSpiderTFN:gsub(".lua$",ext)
+         local a  = {}
+         a[#a+1]  = LUAC_PATH
+         a[#a+1]  = "-o"
+         a[#a+1]  = fn
+         a[#a+1]  = userSpiderTFN
+         lmod_system_execute(concatTbl(a," "))
+      end
+      if (isFile(self.usrCacheInvalidFn)) then
+         dbg.print{"unlinking: ",self.usrCacheInvalidFn,"\n"}
+         posix.unlink(self.usrCacheInvalidFn)
+      end
+
+      local ancient2 = math.min(delta_t * 120, ancient)
+
+      mt:setRebuildTime(ancient2, delta_t)
+      dbg.print{"mt: ", tostring(mt), "\n"}
+      doneMsg = " (written to file) done."
+
+   end
+   cTimer:done(doneMsg)
+end
+
+
+
 --------------------------------------------------------------------------
 -- This is the client code interface to getting the cache
 -- files.  It is also responsible for writing the user cache
@@ -434,6 +546,7 @@ function M.build(self, fast)
    local masterTbl   = masterTbl()
    local T1          = epoch()
    local sysDirsRead = 0
+
    dbg.print{"buildFresh: ",self.buildFresh,"\n"}
    if (not (self.buildFresh or masterTbl.checkSyntax)) then
       sysDirsRead = l_readCacheFile(self, mpathA, self.systemDirA)
@@ -485,177 +598,38 @@ function M.build(self, fast)
 
    local userSpiderTFN = self.usrSpiderTFN
    local buildSpiderT  = (#dirA > 0)
-   local userSpiderT   = {}
    dbg.print{"buildSpiderT: ",buildSpiderT,"\n"}
+   local tracing  = cosmic:value("LMOD_TRACING")
+   if (tracing == "yes") then
+      tracing_msg{"Building Spider cache for the following dir(s): ",
+                  concatTbl(mpA,", ")}
+   end
 
-   dbg.print{"mt: ", tostring(mt), "\n",level=2}
-
-   local short     = mt:getShortTime()
-   if (not buildSpiderT) then
-      mt:setRebuildTime(ancient, short)
-   else
-      local tracing  = cosmic:value("LMOD_TRACING")
-      if (tracing == "yes") then
-         local shell      = _G.Shell
-         local stackDepth = FrameStk:singleton():stackDepth()
-         local indent     = ("  "):rep(stackDepth+1)
-         local b          = {}
-         b[#b + 1]        = indent
-         b[#b + 1]        = "Building Spider cache for the following dir(s): "
-         b[#b + 1]        = concatTbl(mpA,", ")
-         b[#b + 1]        = "\n"
-         shell:echo(concatTbl(b,""))
-      end
-
-      local prtRbMsg = ((not quiet())                        and
-                        (not masterTbl.initial)              and
-                        ((not short) or (short > shortTime)) and
-                        (not self.quiet)
-                       )
-      dbg.print{"short:    ", short,  ", shortTime: ", shortTime,"\n", level=2}
-      dbg.print{"quiet:    ", quiet(),", initial:   ", masterTbl.initial,"\n"}
-      dbg.print{"prtRbMsg: ",prtRbMsg,", quiet:     ",self.quiet,"\n"}
-
-      local threshold = cosmic:value("LMOD_THRESHOLD")
-      local cTimer    = CTimer:singleton("Rebuilding cache, please wait ...",
-                                         threshold, prtRbMsg, masterTbl.timeout)
-      local mcp_old   = mcp
-      dbg.print{"Setting mcp to ", mcp:name(),"\n"}
-      mcp                 = MasterControl.build("spider")
-
-      local t1            = epoch()
-      local ok, msg       = pcall(Spider.findAllModules, spider, mpA, userSpiderT)
-      if (not ok) then
-         if (msg) then io.stderr:write("Msg: ",msg,'\n') end
-         LmodSystemError{msg="e_Spdr_Timeout"}
-      end
-      local t = masterTbl.mpathMapT
-      if (next(t) ~= nil) then
-         for k,v in pairs(t) do
-            mpathMapT[k] = v
-         end
-      end
-
-      local t2       = epoch()
-      mcp            = mcp_old
-      dbg.print{"Setting mcp to ", mcp:name(),"\n"}
-
-      dbg.print{"t2-t1: ",t2-t1, " shortTime: ", shortTime, "\n", level=2}
-
-      local r = {}
-      hook.apply("writeCache",r)
-
-      dbg.print{"self.dontWrite: ", self.dontWrite, ", r.dontWriteCache: ",
-                r.dontWriteCache, "\n"}
-
-      local dontWrite = self.dontWrite or r.dontWriteCache or cosmic:value("LMOD_IGNORE_CACHE")
-
-      if (tracing == "yes") then
-         local shell      = _G.Shell
-         local stackDepth = FrameStk:singleton():stackDepth()
-         local indent     = ("  "):rep(stackDepth+1)
-         local b          = {}
-         b[#b + 1]        = indent
-         b[#b + 1]        = "completed building cache. Saving cache: "
-         b[#b + 1]        = tostring(not(t2 - t1 < shortTime or dontWrite))
-         b[#b + 1]        = "\n"
-         shell:echo(concatTbl(b,""))
-      end
-
-
-
-      local doneMsg
-      mrc = MRC:singleton()
-
-      if (t2 - t1 < shortTime or dontWrite) then
-         ancient = shortLifeCache
-
-         ------------------------------------------------------------------------
-         -- This is a bit of a hack.  Lmod needs to know the time it takes to
-         -- build the cache and it needs to store it in the ModuleTable.  The
-         -- trouble is with regression testing.  The module table is only written
-         -- out when it value changes.  We do not want a new module written out
-         -- if the only thing that has changed is the slight variation that it
-         -- took to build the cache between Lmod command runs during a regression
-         -- test.  So if the previous t2-t1 is also less than shortTime DO NOT
-         -- reset short to the new value.
-
-         local newShortTime = t2-t1
-         if (short and short < shortTime) then
-            newShortTime = short
-         end
-         mt:setRebuildTime(ancient, newShortTime)
-         dbg.print{"mt: ", tostring(mt), "\n", level=2}
-         doneMsg = " (not written to file) done"
-      else
-         mkdir_recursive(self.usrCacheDir)
-         local userSpiderTFN_new = userSpiderTFN .. "_" .. l_uuid()
-         local f                 = io.open(userSpiderTFN_new,"w")
-         if (f) then
-            os.rename(userSpiderTFN, userSpiderTFN .. "~")
-            local s0 = "-- Date: " .. os.date("%c",os.time()) .. "\n"
-            local s1 = "ancient = " .. tostring(math.floor(ancient)) .."\n"
-            local s2 = mrc:export()
-            local s3 = serializeTbl{name="spiderT",      value=userSpiderT, indent=true}
-            local s4 = serializeTbl{name="mpathMapT",    value=mpathMapT,   indent=true}
-            f:write(s0,s1,s2,s3,s4)
-            f:close()
-            ok, msg = os.rename(userSpiderTFN_new, userSpiderTFN)
-            if (not ok) then
-               LmodError{msg="e_Unable_2_rename",from=userSpiderTFN_new,to=userSpiderTFN, errMsg=msg}
-            end
-            posix.unlink(userSpiderTFN .. "~")
-            dbg.print{"Wrote: ",userSpiderTFN,"\n"}
-         end
-
-         if (LUAC_PATH ~= "") then
-            if (LUAC_PATH:sub(1,1) == "@") then
-               LUAC_PATH="luac"
-            end
-            local ext = ".luac_"..LuaV
-            local fn = userSpiderTFN:gsub(".lua$",ext)
-            local a  = {}
-            a[#a+1]  = LUAC_PATH
-            a[#a+1]  = "-o"
-            a[#a+1]  = fn
-            a[#a+1]  = userSpiderTFN
-            lmod_system_execute(concatTbl(a," "))
-         end
-         if (isFile(self.usrCacheInvalidFn)) then
-            dbg.print{"unlinking: ",self.usrCacheInvalidFn,"\n"}
-            posix.unlink(self.usrCacheInvalidFn)
-         end
-
-         local buildT   = t2-t1
-         local ancient2 = math.min(buildT * 120, ancient)
-
-         mt:setRebuildTime(ancient2, buildT)
-         dbg.print{"mt: ", tostring(mt), "\n"}
-         doneMsg = " (written to file) done."
-      end
-      cTimer:done(doneMsg)
-      dbg.print{"Transfer from userSpiderT to spiderT\n"}
-      for k in Pairs(userSpiderT) do
-         dbg.print{"k: ",k,"\n"}
-         spiderT[k] = userSpiderT[k]
-      end
-      dbg.print{"Show that these directories have been walked\n"}
-      t2 = epoch()
-      for i = 1,#dirA do
-         local k = dirA[i]
-         spiderDirT[k] = t2
-      end
+   local t1            = epoch()
+   local ok, msg
 
+   ok, msg       = pcall(Spider.findAllModules, spider, mpathA, spiderT, mpathMapT)
+   if (not ok) then
+      if (msg) then io.stderr:write("Msg: ",msg,'\n') end
+      LmodSystemError{msg="e_Spdr_Timeout"}
    end
+   local t2       = epoch()
+   dbg.print{"t2-t1: ",t2-t1, " shortTime: ", shortTime, "\n", level=2}
 
+   l_writeUserSpiderCacheWhenNecessary(self, t2-t1, mpathA, spiderT, mpathMapT)
 
-   -- With a valid spiderT build dbT if necessary:
-   if (next(dbT) == nil or buildSpiderT) then
-      local mpathA = mt:modulePathA()
-      spider:buildDbT(mpathA, mpathMapT, spiderT, dbT)
-      spider:buildProvideByT(dbT, providedByT)
+   dbg.print{"Show that these directories have been walked\n"}
+   t2 = epoch()
+   for i = 1,#mpathA do
+      local k = mpathA[i]
+      spiderDirT[k] = t2
    end
 
+   -- With a valid spiderT build dbT
+   mpathA = mt:modulePathA()
+   spider:buildDbT(mpathA, mpathMapT, spiderT, dbT)
+   spider:buildProvideByT(dbT, providedByT)
+
    -- remove user cache file if old
    if (isFile(userSpiderTFN)) then
       local attr   = lfs.attributes(userSpiderTFN)
diff --git a/src/Configuration.lua b/src/Configuration.lua
index 2eb153ae7..36473fd38 100644
--- a/src/Configuration.lua
+++ b/src/Configuration.lua
@@ -133,6 +133,7 @@ local function l_new(self)
    local activeTerm        = haveTermSupport() and "true" or colorize("red","false")
    local avail_style       = cosmic:value("LMOD_AVAIL_STYLE")
    local lmod_configDir    = cosmic:value("LMOD_CONFIG_DIR")
+   local dynamic_cache     = cosmic:value("LMOD_DYNAMIC_SPIDER_CACHE")
    local ksh_support       = cosmic:value("LMOD_KSH_SUPPORT")
    local extended_default  = cosmic:value("LMOD_EXTENDED_DEFAULT")
    local avail_extensions  = cosmic:value("LMOD_AVAIL_EXTENSIONS")
@@ -210,6 +211,7 @@ local function l_new(self)
    tbl.disp_av_ext  = { k = "Display Extension w/ avail"        , v = avail_extensions, }
    tbl.dot_files    = { k = "Using dotfiles"                    , v = using_dotfiles,   }
    tbl.dupPaths     = { k = "Allow duplicate paths"             , v = duplicate_paths,  }
+   tbl.dynamicC     = { k = "Dynamic Spider Cache"              , v = dynamic_cache,    }
    tbl.extendDflt   = { k = "Allow extended default"            , v = extended_default, }
    tbl.exactMatch   = { k = "Require Exact Match/no defaults"   , v = exactMatch,       }
    tbl.expMCmd      = { k = "Export the module command"         , v = export_module,    }
diff --git a/src/DirTree.lua b/src/DirTree.lua
index 6e1d6401e..8fa105bdb 100644
--- a/src/DirTree.lua
+++ b/src/DirTree.lua
@@ -161,7 +161,7 @@ local function l_versionFile(mrc, mpath, defaultA)
    return defaultA
 end
 
-local function l_walk(mrc, mpath, path, dirA, fileT,regularFn)
+local function l_walk(mrc, mpath, path, dirA, fileT, regularFn)
    dbg.start{"l_walk(mrc,mpath:\"",mpath,"\", path:\"",path,"\", dirA, fileT, regularFn"}
    local defaultA   = {}
    local permissions
@@ -210,7 +210,9 @@ local function l_walk(mrc, mpath, path, dirA, fileT,regularFn)
                   fileT[fullName]   = {fn = file, canonical = f:gsub("%.lua$", ""), mpath = mpath,
                                        luaExt = luaExt, dot_version = dot_version}
                else
-                  regularFn = regularFn + 1
+                  if (f:sub(1,1) ~= ".") then
+                     regularFn = regularFn + 1
+                  end
                end
             end
          end
@@ -281,6 +283,7 @@ local function l_build(mpathA)
       if (isDir(mpath)) then
          local dirT  = {}
          regularFn = l_walk_tree(mrc, mpath, mpath, dirT, regularFn)
+         --dbg.print{"regularFn: ",tostring(regularFn),"\n"}
          if (regularFn > 100) then
             LmodWarning{msg="w_Too_Many_RegularFn",mpath=mpath,regularFn=tostring(regularFn)}
          end
diff --git a/src/MC_Access.lua b/src/MC_Access.lua
index 118733256..02562f5c1 100644
--- a/src/MC_Access.lua
+++ b/src/MC_Access.lua
@@ -115,6 +115,7 @@ M.error                = MasterControl.quiet
 M.execute              = MasterControl.execute
 M.extensions           = MasterControl.quiet
 M.family               = MasterControl.quiet
+M.haveDynamicMPATH     = MasterControl.quiet
 M.inherit              = MasterControl.inherit
 M.load                 = MasterControl.quiet
 M.load_any             = MasterControl.quiet
diff --git a/src/MC_CheckSyntax.lua b/src/MC_CheckSyntax.lua
index dbf596f90..e035b26c8 100644
--- a/src/MC_CheckSyntax.lua
+++ b/src/MC_CheckSyntax.lua
@@ -59,6 +59,7 @@ M.depends_on           = MasterControl.quiet
 M.execute              = MasterControl.quiet
 M.extensions           = MasterControl.quiet
 M.family               = MasterControl.quiet
+M.haveDynamicMPATH     = MasterControl.quiet
 M.help                 = MasterControl.quiet
 M.inherit              = MasterControl.quiet
 M.load                 = MasterControl.load
diff --git a/src/MC_ComputeHash.lua b/src/MC_ComputeHash.lua
index 13d9edbf5..d6886090b 100644
--- a/src/MC_ComputeHash.lua
+++ b/src/MC_ComputeHash.lua
@@ -76,6 +76,7 @@ M.error                = MasterControl.quiet
 M.execute              = MasterControl.quiet
 M.extensions           = MasterControl.quiet
 M.family               = MasterControl.quiet
+M.haveDynamicMPATH     = MasterControl.quiet
 M.help                 = MasterControl.quiet
 M.inherit              = MasterControl.quiet
 M.message              = MasterControl.quiet
diff --git a/src/MC_DependencyCk.lua b/src/MC_DependencyCk.lua
index 9c2f8118b..32cec107b 100644
--- a/src/MC_DependencyCk.lua
+++ b/src/MC_DependencyCk.lua
@@ -59,6 +59,7 @@ M.depends_on           = MasterControl.dependencyCk
 M.execute              = MasterControl.quiet
 M.extensions           = MasterControl.quiet
 M.family               = MasterControl.quiet
+M.haveDynamicMPATH     = MasterControl.quiet
 M.help                 = MasterControl.quiet
 M.inherit              = MasterControl.quiet
 M.load                 = MasterControl.quiet
diff --git a/src/MC_Load.lua b/src/MC_Load.lua
index dc7823c19..031276b0b 100644
--- a/src/MC_Load.lua
+++ b/src/MC_Load.lua
@@ -57,6 +57,7 @@ M.depends_on           = MasterControl.depends_on
 M.execute              = MasterControl.execute
 M.extensions           = MasterControl.quiet
 M.family               = MasterControl.family
+M.haveDynamicMPATH     = MasterControl.quiet
 M.help                 = MasterControl.quiet
 M.inherit              = MasterControl.inherit
 M.load                 = MasterControl.load
diff --git a/src/MC_MgrLoad.lua b/src/MC_MgrLoad.lua
index f2cebe348..b2c15640d 100644
--- a/src/MC_MgrLoad.lua
+++ b/src/MC_MgrLoad.lua
@@ -59,6 +59,7 @@ M.execute              = MasterControl.execute
 M.extensions           = MasterControl.quiet
 M.family               = MasterControl.family
 M.help                 = MasterControl.quiet
+M.haveDynamicMPATH     = MasterControl.quiet
 M.inherit              = MasterControl.inherit
 M.load                 = MasterControl.fake_load
 M.load_any             = MasterControl.fake_load
diff --git a/src/MC_Refresh.lua b/src/MC_Refresh.lua
index 6dfe020de..d1f2bfbf1 100644
--- a/src/MC_Refresh.lua
+++ b/src/MC_Refresh.lua
@@ -62,6 +62,7 @@ M.execute              = MasterControl.execute
 M.extensions           = MasterControl.quiet
 M.family               = MasterControl.quiet
 M.help                 = MasterControl.quiet
+M.haveDynamicMPATH     = MasterControl.quiet
 M.inherit              = MasterControl.quiet
 M.load                 = MasterControl.quiet
 M.load_any             = MasterControl.quiet
diff --git a/src/MC_Show.lua b/src/MC_Show.lua
index d7e3c0a49..8e2393947 100644
--- a/src/MC_Show.lua
+++ b/src/MC_Show.lua
@@ -333,6 +333,14 @@ function M.conflict(self, mA)
    A[#A+1] = ShowCmdA("conflict",mA)
 end
 
+--------------------------------------------------------------------------
+-- Print conflict command.
+-- @param self A MasterControl object
+-- @param mA An array of module names (MName objects)
+function M.haveDynamicMPATH(self, mA)
+   A[#A+1] = ShowCmdA("haveDynamicMPATH",mA)
+end
+
 --------------------------------------------------------------------------
 -- Print set shell function
 -- @param self A MasterControl object
diff --git a/src/MC_Spider.lua b/src/MC_Spider.lua
index fcdc98233..2fa8b579d 100644
--- a/src/MC_Spider.lua
+++ b/src/MC_Spider.lua
@@ -154,6 +154,12 @@ function M.help(self,...)
    return true
 end
 
+function M.haveDynamicMPATH(self)
+   dbg.start{"MC_Spider:haveDynamicMPATH()"}
+   Spider_dynamic_mpath()
+   dbg.fini("MC_Spider:haveDynamicMPATH")
+end
+
 --------------------------------------------------------------------------
 -- MC_Spider:extensions(...): Copy the list of provides to moduleT
 -- @param self A MasterControl object.
diff --git a/src/MC_Unload.lua b/src/MC_Unload.lua
index f2afdd4f7..b5e8ee26c 100644
--- a/src/MC_Unload.lua
+++ b/src/MC_Unload.lua
@@ -62,6 +62,7 @@ M.error                = MasterControl.warning
 M.execute              = MasterControl.execute
 M.extensions           = MasterControl.quiet
 M.family               = MasterControl.unset_family
+M.haveDynamicMPATH     = MasterControl.quiet
 M.help                 = MasterControl.quiet
 M.inherit              = MasterControl.inherit
 M.load                 = MasterControl.unload
diff --git a/src/Master.lua b/src/Master.lua
index ad5b77c2f..3505e7769 100644
--- a/src/Master.lua
+++ b/src/Master.lua
@@ -310,14 +310,7 @@ function M.load(self, mA)
             dbg.print{"i: ",i,", stackDepth: ", frameStk:stackDepth(),"\n"}
             mcp:pushModule(mname)
             if (tracing == "yes") then
-               local stackDepth = frameStk:stackDepth()
-               local indent     = ("  "):rep(stackDepth+1)
-               local b          = {}
-               b[#b + 1]        = indent
-               b[#b + 1]        = "Pushing "
-               b[#b + 1]        = userName
-               b[#b + 1]        = " on moduleQ\n"
-               shell:echo(concatTbl(b,""))
+               tracing_msg{"Pushing ", userName, " on moduleQ"}
             end
             break
          end
@@ -327,23 +320,15 @@ function M.load(self, mA)
          local loaded     = false
 
          if (tracing == "yes") then
-            local stackDepth = frameStk:stackDepth()
             local use_cache  = (not masterTbl.terse) or (cosmic:value("LMOD_CACHED_LOADS") ~= "no")
             local moduleA    = ModuleA:singleton{spider_cache=use_cache}
             local isNVV      = moduleA:isNVV()
-            local indent     = ("  "):rep(stackDepth+1)
-            local b          = {}
             TraceCounter     = TraceCounter + 1
-            b[#b + 1]        = indent
-            b[#b + 1]        = "(" .. tostring(TraceCounter) .. ")"
-            b[#b + 1]        = "(" .. tostring(ReloadAllCntr) .. ")"
-            b[#b + 1]        = "Loading: "
-            b[#b + 1]        = userName
-            b[#b + 1]        = " (fn: "
-            b[#b + 1]        = fn or "nil"
-            b[#b + 1]        = isNVV and ", using Find-First" or ", using Find-Best"
-            b[#b + 1]        = ")\n"
-            shell:echo(concatTbl(b,""))
+            tracing_msg{"(" .. tostring(TraceCounter) .. ")",
+                        "(" .. tostring(ReloadAllCntr) .. ")",
+                        "Loading: ", userName, " (fn: ", fn or "nil",
+                        isNVV and ", using Find-First" or ", using Find-Best",
+                        ")" }
          end
 
          dbg.print{"Master:load i: ",i," sn: ",sn," fn: ",fn,"\n"}
@@ -497,21 +482,11 @@ function M.unload(self,mA)
       local fn       = mname:fn()
       local status   = mt:status(sn)
       if (tracing == "yes") then
-         local stackDepth = frameStk:stackDepth()
-         local indent     = ("  "):rep(stackDepth+1)
-         local b          = {}
          TraceCounter     = TraceCounter + 1
-         b[#b + 1]        = indent
-         b[#b + 1]        = "(" .. tostring(TraceCounter) .. ")"
-         b[#b + 1]        = "(" .. tostring(ReloadAllCntr) .. ")"
-         b[#b + 1]        = "Unloading: "
-         b[#b + 1]        = userName
-         b[#b + 1]        = " (status: "
-         b[#b + 1]        = status
-         b[#b + 1]        = ") (fn: "
-         b[#b + 1]        = fn or "nil"
-         b[#b + 1]        = ")\n"
-         shell:echo(concatTbl(b,""))
+         tracing_msg{"(" .. tostring(TraceCounter) .. ")",
+                     "(" .. tostring(ReloadAllCntr) .. ")",
+                     "Unloading: ", userName, " (status: ",
+                     status, ") (fn: ", fn or "nil", ")" }
       end
 
       dbg.print{"Trying to unload: ", userName, " sn: ", sn,"\n"}
@@ -587,20 +562,12 @@ function M.reloadAll(self, force_update)
    local mA       = {}
 
    if (tracing == "yes") then
-      local stackDepth = frameStk:stackDepth()
-      local indent     = ("  "):rep(stackDepth+1)
       local nameA      = {}
       for i = 1, #a do
          nameA[#nameA + 1 ] = a[i].userName
       end
-      local b          = {}
-      b[#b + 1]        = indent
-      b[#b + 1]        = "reloadAll("
-      b[#b + 1]        = tostring(ReloadAllCntr)
-      b[#b + 1]        = ")("
-      b[#b + 1]        = concatTbl(nameA, ", ")
-      b[#b + 1]        = ")\n"
-      shell:echo(concatTbl(b,""))
+      tracing_msg{"reloadAll(", tostring(ReloadAllCntr),")(",
+                  concatTbl(nameA, ", "), ")"}
    end
 
    for i = 1, #a do
diff --git a/src/MasterControl.lua b/src/MasterControl.lua
index 5ae018817..5d741f530 100644
--- a/src/MasterControl.lua
+++ b/src/MasterControl.lua
@@ -1610,4 +1610,8 @@ function M.missing_module(self,userName, showName)
    s_missingModuleT[userName] = showName
 end
 
+function M.haveDynamicMPATH(self)
+   -- This function is non-empty when in Spider mode only
+end
+
 return M
diff --git a/src/Options.lua b/src/Options.lua
index 49b42068a..c7561056f 100644
--- a/src/Options.lua
+++ b/src/Options.lua
@@ -200,7 +200,7 @@ function M.singleton(self, usage)
    }
 
    cmdlineParser:add_option{
-      name   = {"--ignore_cache"},
+      name   = {"-I", "--ignore_cache"},
       dest   = "ignoreCache",
       action = "store_true",
       help   = i18n("cache_hlp"),
diff --git a/src/Spider.lua b/src/Spider.lua
index 18836bcdf..25999e19a 100644
--- a/src/Spider.lua
+++ b/src/Spider.lua
@@ -113,16 +113,26 @@ local function l_processNewModulePATH(path)
    local moduleStack = masterTbl.moduleStack
    local iStack      = #moduleStack
    local mpath_old   = moduleStack[iStack].mpath
+   local moduleT     = moduleStack[iStack].moduleT
    local fullName    = moduleStack[iStack].fullName
    local t           = mpathMapT[mpath_new] or {}
    t[fullName]       = mpath_old
 
    if (mpath_new ~= mpath_old) then
       mpathMapT[mpath_new] = t
+      moduleT.changeMPATH = true
    end
 
 end
 
+function Spider_dynamic_mpath()
+   local masterTbl   = masterTbl()
+   local moduleStack = masterTbl.moduleStack
+   local iStack      = #moduleStack
+   local moduleT     = moduleStack[iStack].moduleT
+   moduleT.changeMPATH = true
+end
+
 function Spider_append_path(kind, t)
    local name  = t[1]
    local value = t[2]
@@ -150,49 +160,42 @@ function Spider_append_path(kind, t)
    end
 end
 
+local shellNm = "bash"
 
-local function l_findModules(mpath, mt, mList, sn, v, moduleT)
-
-   local shell    = _G.Shell
-   local tracing  = cosmic:value("LMOD_TRACING")
-   local function l_loadMe(entryT, moduleStack, iStack, myModuleT)
-      local shellNm       = "bash"
-      local fn            = entryT.fn
-      local sn            = entryT.sn
-      local fullName      = entryT.fullName
-      local version       = entryT.version
-      moduleStack[iStack] = { mpath = mpath, sn = sn, fullName = fullName, moduleT = myModuleT, fn = fn}
-      local mname         = MName:new("entryT", entryT)
-      mt:add(mname, "pending")
-
-      if (tracing == "yes") then
-         local b          = {}
-         b[#b + 1]        = "Spider Loading: "
-         b[#b + 1]        = fullName
-         b[#b + 1]        = " (fn: "
-         b[#b + 1]        = fn or "nil"
-         b[#b + 1]        = ")\n"
-         shell:echo(concatTbl(b,""))
-      end
+local function l_loadMe(entryT, moduleStack, iStack, myModuleT, mt, mList, mpath, sn, msg)
+   local shell         = _G.Shell
+   local tracing       = cosmic:value("LMOD_TRACING")
+   local fn            = entryT.fn
+   local sn            = entryT.sn
+   local fullName      = entryT.fullName
+   local version       = entryT.version
+   moduleStack[iStack] = { mpath = mpath, sn = sn, fullName = fullName, moduleT = myModuleT, fn = fn}
+   local mname         = MName:new("entryT", entryT)
+   mt:add(mname, "pending")
 
-      loadModuleFile{file=fn, help=true, shell=shellNm, reportErr=false, mList = mList}
-      hook.apply("load_spider",{fn = fn, modFullName = fullName, sn = sn})
-      mt:setStatus(sn, "active")
+   if (tracing == "yes") then
+      tracing_msg{msg, fullName, " (fn: ", fn or "nil", ")"}
    end
 
+   loadModuleFile{file=fn, help=true, shell=shellNm, reportErr=false, mList = mList}
+   hook.apply("load_spider",{fn = fn, modFullName = fullName, sn = sn})
+   mt:setStatus(sn, "active")
+end
+
+local function l_findModules(mpath, mt, mList, sn, v, moduleT)
    local entryT
    local moduleStack = masterTbl().moduleStack
    local iStack      = #moduleStack
    if (v.file) then
       entryT   = { fn = v.file, sn = sn, userName = sn, fullName = sn, version = false}
-      l_loadMe(entryT, moduleStack, iStack, v.metaModuleT)
+      l_loadMe(entryT, moduleStack, iStack, v.metaModuleT, mt, mList, mpath, sn, "Spider Loading:       ")
    end
    if (next(v.fileT) ~= nil) then
       for fullName, vv in pairs(v.fileT) do
          vv.Version = extractVersion(fullName, sn)
          entryT   = { fn = vv.fn, sn = sn, userName = fullName, fullName = fullName,
                       version = vv.Version }
-         l_loadMe(entryT, moduleStack, iStack, vv)
+         l_loadMe(entryT, moduleStack, iStack, vv, mt, mList, mpath, sn, "Spider Loading:       ")
       end
    end
    if (next(v.dirT) ~= nil) then
@@ -202,6 +205,30 @@ local function l_findModules(mpath, mt, mList, sn, v, moduleT)
    end
 end
 
+local function l_findChangeMPATH_modules(mpath, mt, mList, sn, v, moduleT)
+   local entryT
+   local moduleStack = masterTbl().moduleStack
+   local iStack      = #moduleStack
+   if (v.file) then
+      LmodError("Calling l_findChangeMPATH_modules w v.file")
+   end
+   if (next(v.fileT) ~= nil) then
+      for fullName, vv in pairs(v.fileT) do
+         if (vv.changeMPATH == true) then
+            vv.Version = extractVersion(fullName, sn)
+            entryT   = { fn = vv.fn, sn = sn, userName = fullName, fullName = fullName,
+                         version = vv.Version }
+            l_loadMe(entryT, moduleStack, iStack, vv, mt, mList, mpath, sn,"Spider Loading again: ")
+         end
+      end
+   end
+   if (next(v.dirT) ~= nil) then
+      for name, vv in pairs(v.dirT) do
+         l_findChangeMPATH_modules(mpath, mt, mList, sn, vv)
+      end
+   end
+end
+
 function M.searchSpiderDB(self, strA, dbT, providedByT)
    dbg.start{"Spider:searchSpiderDB({",concatTbl(strA,","),"},spider, dbT)"}
    local masterTbl = masterTbl()
@@ -261,14 +288,12 @@ function M.searchSpiderDB(self, strA, dbT, providedByT)
    return kywdT, kywdExtsT
 end
 
-
-
-
-function M.findAllModules(self, mpathA, spiderT)
+function M.findAllModules(self, mpathA, spiderT, mpathMapT)
    dbg.start{"Spider:findAllModules(",concatTbl(mpathA,", "),")"}
    spiderT.version = LMOD_CACHE_VERSION
 
    local tracing         = cosmic:value("LMOD_TRACING")
+   local dynamicCache    = (cosmic:value("LMOD_DYNAMIC_SPIDER_CACHE") ~= "no")
    local mt              = deepcopy(MT:singleton())
    local maxdepthT       = mt:maxDepthT()
    local masterTbl       = masterTbl()
@@ -281,11 +306,16 @@ function M.findAllModules(self, mpathA, spiderT)
    local exit            = os.exit
    os.exit               = l_nothing
    
+   local mcp_old   = mcp
+   dbg.print{"Setting mcp to ", mcp:name(),"\n"}
+   mcp = MasterControl.build("spider")
+
+
    sandbox_set_os_exit(l_nothing)
    if (tracing == "no" and not dbg.active()) then
+      dbg.print{"Turning off stdio\n"}
       turn_off_stdio()
    end
-   dbg.print{"setting os.exit to l_nothing; turn off output to stderr\n"}
    if (Use_Preload) then
       local a = {}
       mList   = getenv("LOADEDMODULES") or ""
@@ -307,6 +337,8 @@ function M.findAllModules(self, mpathA, spiderT)
       end
    end
 
+   local seenT = {}
+
    while(#dirStk > 0) do
       repeat
 
@@ -314,32 +346,58 @@ function M.findAllModules(self, mpathA, spiderT)
          local mpath     = dirStk[#dirStk]
          dirStk[#dirStk] = nil
 
-         -- skip mpath directory if already walked.
-         if (spiderT[mpath]) then break end
-
          -- skip mpath if directory does not exist
          -- or can not be read
          local attr  = lfs.attributes(mpath)
          if (not attr or attr.mode ~= "directory" or
              (not access(mpath,"rx")))               then break end
 
-         dbg.print{"mpath: ", mpath,"\n"}
-         local moduleA     = ModuleA:__new({mpath}, maxdepthT):moduleA()
-         local T           = moduleA[1].T
-         for sn, v in pairs(T) do
-            l_findModules(mpath, mt, mList, sn, v)
+         -- skip mpath directory if already walked.
+         if (seenT[mpath] or not isDir(mpath)) then break end
+
+         if (spiderT[mpath] == nil ) then
+            dbg.print{"Running l_findModules on: ", mpath,"\n"}
+            if (tracing == "yes") then
+               tracing_msg{"Full spider search on ",mpath}
+            end
+            
+            local moduleA     = ModuleA:__new({mpath}, maxdepthT):moduleA()
+            local T           = moduleA[1].T
+            for sn, v in pairs(T) do
+               l_findModules(mpath, mt, mList, sn, v)
+            end
+            spiderT[mpath] = moduleA[1].T
+         elseif (dynamicCache) then
+            dbg.print{"Running l_findChangeMPATH_modules on: ", mpath,"\n"}
+            if (tracing == "yes") then
+               tracing_msg{"dynamic spider search on ",mpath}
+            end
+            for sn, v in pairs(spiderT[mpath]) do
+               l_findChangeMPATH_modules(mpath, mt, mList, sn, v)
+            end
          end
-         spiderT[mpath] = moduleA[1].T
+         seenT[mpath]   = true
       until true
    end
 
-   dbg.print{"Resetting os.exit back; stderr back on\n"}
+   dbg.print{"Resetting os.exit back\n"}
    os.exit               = exit
    sandbox_set_os_exit(exit)
    if (tracing == "no" and not dbg.active()) then
       turn_on_stdio()
+      dbg.print{"stderr back on\n"}
    end
+
+   local t = masterTbl.mpathMapT
+   if (next(t) ~= nil) then
+      for k,v in pairs(t) do
+         mpathMapT[k] = v
+      end
+   end
+
    dbg.fini("Spider:findAllModules")
+   mcp = mcp_old
+   dbg.print{"Setting mcp to ", mcp:name(),"\n"}
 end
 
 function extend(a,b)
diff --git a/src/Var.lua b/src/Var.lua
index e53989b0b..4e34baa24 100644
--- a/src/Var.lua
+++ b/src/Var.lua
@@ -281,16 +281,7 @@ function M.remove(self, value, where, priority, nodups, force)
 
    local tracing  = cosmic:value("LMOD_TRACING")
    if (tracing == "yes" and self.name == ModulePath ) then
-      local shell      = _G.Shell
-      local frameStk   = require("FrameStk"):singleton()
-      local stackDepth = frameStk:stackDepth()
-      local indent     = ("  "):rep(stackDepth+1)
-      local b          = {}
-      b[#b + 1]        = indent
-      b[#b + 1]        = "Removing: "
-      b[#b + 1]        = value
-      b[#b + 1]        = " from MODULEPATH\n"
-      shell:echo(concatTbl(b,""))
+      tracing_msg{"Removing: ", value, " from MODULEPATH"}
    end
 
    for i = 1, #pathA do
@@ -383,16 +374,7 @@ function M.prepend(self, value, nodups, priority)
 
    local tracing  = cosmic:value("LMOD_TRACING")
    if (tracing == "yes" and name == ModulePath ) then
-      local shell      = _G.Shell
-      local frameStk   = require("FrameStk"):singleton()
-      local stackDepth = frameStk:stackDepth()
-      local indent     = ("  "):rep(stackDepth+1)
-      local b          = {}
-      b[#b + 1]        = indent
-      b[#b + 1]        = "Prepending: "
-      b[#b + 1]        = value
-      b[#b + 1]        = " to MODULEPATH\n"
-      shell:echo(concatTbl(b,""))
+      tracing_msg{"Prepending: ", value, " to MODULEPATH"}
    end
 
    local imin = min(self.imin, 0)
@@ -439,16 +421,7 @@ function M.append(self, value, nodups, priority)
 
    local tracing  = cosmic:value("LMOD_TRACING")
    if (tracing == "yes" and name == ModulePath ) then
-      local shell      = _G.Shell
-      local frameStk   = require("FrameStk"):singleton()
-      local stackDepth = frameStk:stackDepth()
-      local indent     = ("  "):rep(stackDepth+1)
-      local b          = {}
-      b[#b + 1]        = indent
-      b[#b + 1]        = "Appending: "
-      b[#b + 1]        = value
-      b[#b + 1]        = " to MODULEPATH\n"
-      shell:echo(concatTbl(b,""))
+      tracing_msg{"Appending: ", value, " to MODULEPATH"}
    end
 
    local tbl  = self.tbl
diff --git a/src/check_module_tree_syntax.in.lua b/src/check_module_tree_syntax.in.lua
index dd0093073..607da8f28 100644
--- a/src/check_module_tree_syntax.in.lua
+++ b/src/check_module_tree_syntax.in.lua
@@ -181,13 +181,7 @@ function check_syntax(mpath, mt, mList, sn, fn, fullName, errorA)
       frameStk:push(mname)
       mt:add(mname, "pending")
       if (tracing == "yes") then
-         local b          = {}
-         b[#b + 1]        = "check_syntax Loading: "
-         b[#b + 1]        = fullName
-         b[#b + 1]        = " (fn: "
-         b[#b + 1]        = fn or "nil"
-         b[#b + 1]        = ")\n"
-         shell:echo(concatTbl(b,""))
+         tracing_msg{"check_syntax Loading: ", fullName, " (fn: ", fn or "nil",")"}
       end
       loadModuleFile{file=entryT.fn, shell=shellNm, help=true, reportErr=true, mList = mList}
       mt = frameStk:mt()
diff --git a/src/lmod.in.lua b/src/lmod.in.lua
index 5918ad334..9b4b61378 100644
--- a/src/lmod.in.lua
+++ b/src/lmod.in.lua
@@ -391,14 +391,8 @@ function main()
 
    local tracing = cosmic:value("LMOD_TRACING")
    if (tracing == "yes" ) then
-      local a   = {}
-      a[#a + 1] = "Lmod version: "
-      a[#a + 1] = Version.name()
-      a[#a + 1] = "\n"
-      a[#a + 1] = "running: module "
-      a[#a + 1] = concatTbl(arg," ")
-      a[#a + 1] = "\n"
-      Shell:echo(concatTbl(a,""))
+      tracing_msg{"Lmod version: ", Version.name(), "\n",
+                  "running: module ", concatTbl(arg," ")}
    end
 
    -- gitversion and quit if requested.
diff --git a/src/modfuncs.lua b/src/modfuncs.lua
index 8346f5675..8dd52b1d4 100644
--- a/src/modfuncs.lua
+++ b/src/modfuncs.lua
@@ -358,6 +358,13 @@ function mode()
    return b
 end
 
+function haveDynamicMPATH()
+   dbg.start{"haveDynamicMPATH()"}
+   mcp:haveDynamicMPATH()
+   dbg.fini("haveDynamicMPATH")
+end
+   
+
 --------------------------------------------------------------------------
 -- Return true if in spider mode.  Use mode function instead.
 function is_spider()
diff --git a/src/myGlobals.lua b/src/myGlobals.lua
index 030cfebb2..da91ad07f 100644
--- a/src/myGlobals.lua
+++ b/src/myGlobals.lua
@@ -123,6 +123,14 @@ cosmic:init{name    = "LMOD_TRACING",
             yn      = "no"}
 
 
+------------------------------------------------------------------------
+-- LMOD_DYNAMIC_SPIDER_CACHE :  Support for Dynamic Spider Caches
+------------------------------------------------------------------------
+
+cosmic:init{name = "LMOD_DYNAMIC_SPIDER_CACHE",
+            sedV = "@dynamic_spider_cache@",
+            yn   = "yes"}
+
 ------------------------------------------------------------------------
 -- LMOD_CASE_INDEPENDENT_SORTING :  make avail and spider use case
 --                                  independent sorting.
diff --git a/src/sandbox.lua b/src/sandbox.lua
index 11a20f6ab..8079e7224 100644
--- a/src/sandbox.lua
+++ b/src/sandbox.lua
@@ -160,6 +160,7 @@ local sandbox_env = {
   uncomplete           = uncomplete,
 
   -- Misc --
+  haveDynamicMPATH     = haveDynamicMPATH,
   LmodBreak            = LmodBreak,
   source_sh            = source_sh,
   LmodMsgRaw           = LmodMsgRaw,
diff --git a/src/utils.lua b/src/utils.lua
index 4fcd147e2..940dd9418 100644
--- a/src/utils.lua
+++ b/src/utils.lua
@@ -601,6 +601,9 @@ function regular_cmp(x,y)
 end
 
 
+
+
+
 function sanizatizeTbl(rplmntA, inT, outT)
    for k, v in pairs(inT) do
       local key = k
@@ -1009,3 +1012,19 @@ function initialize_lmod()
 
    require("SitePackage")
 end
+
+function tracing_msg(msgA)
+   local FrameStk   = require("FrameStk")
+   local shell      = _G.Shell
+   local stackDepth = FrameStk:singleton():stackDepth()
+   local indent     = ("  "):rep(stackDepth+1)
+   local b          = {}
+   b[#b + 1]        = indent
+   for i = 1,#msgA do
+      b[#b+1] = msgA[i]
+   end
+   b[#b + 1]        = "\n"
+   shell:echo(concatTbl(b,""))
+end
+
+