diff --git a/.gitignore b/.gitignore
index ea95bd3991..d75f3eba10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -237,3 +237,9 @@ docs/src/doxygen-config-cpp.1.txt
 docs/src/doxygen-config-cpp.2.txt
 docs/src/doxygen-config-python.1.txt
 docs/src/doxygen-config-python.2.txt
+
+
+*.lo
+*.la
+libsbmlj.*
+navtree*
\ No newline at end of file
diff --git a/config/java.m4 b/config/java.m4
index ee2fd8f0f0..9a128b7b7b 100644
--- a/config/java.m4
+++ b/config/java.m4
@@ -166,81 +166,6 @@ AC_DEFUN([CONFIG_PROG_JAVA],
     dnl
 
     case "$host" in
-      *darwin*)
-        framework="/System/Library/Frameworks/JavaVM.framework"
-        case $JAVA_VERSION in
-          9)
-            if test -e "$framework/Versions/Current/Headers"; then
-              headers="$framework/Versions/Current/Headers"
-            elif test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            fi
-            ;;
-          8)
-            if test -e "$framework/Versions/Current/Headers"; then
-              headers="$framework/Versions/Current/Headers"
-            elif test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            fi
-            ;;
-          7)
-            if test -e "$framework/Versions/Current/Headers"; then
-              headers="$framework/Versions/Current/Headers"
-            elif test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            elif test -e "$framework/Versions/1.7.0/Headers"; then
-              headers="$framework/Versions/1.7.0/Headers"
-            elif test -e "$framework/Versions/1.7/Headers"; then
-              headers="$framework/Versions/1.7/Headers"
-            fi
-            ;;
-          6)
-            if test -e "$framework/Versions/Current/Headers"; then
-              headers="$framework/Versions/Current/Headers"
-            elif test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            elif test -e "$framework/Versions/1.6.0/Headers"; then
-              headers="$framework/Versions/1.6.0/Headers"
-            elif test -e "$framework/Versions/1.6/Headers"; then
-              headers="$framework/Versions/1.6/Headers"
-            fi
-            ;;
-          5)
-            if test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            elif test -e "$framework/Versions/1.5.0/Headers"; then
-              headers="$framework/Versions/1.5.0/Headers"
-            elif test -e "$framework/Versions/1.5/Headers"; then
-              headers="$framework/Versions/1.5/Headers"
-            fi
-            ;;
-        esac
-
-        if ! test -e "$headers/jni.h"; then
-          AC_MSG_ERROR([
-Cannot find Java include files. Your environment may lack a Java
-development kit installation.
-])
-        fi
-
-        JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$headers\""
-
-        parent=`dirname "$headers"`
-        if test $JAVA_VERSION -ge 9; then
-	  JAVADOC_JAR=
-        elif test -e "$parent/Classes/classes.jar"; then
-          JAVADOC_JAR="$parent/Classes/classes.jar"
-        elif test -e "$parent/Classes/tools.jar"; then
-          JAVADOC_JAR="$parent/Classes/tools.jar"
-        elif test -e "${parent}JDK/Classes/classes.jar"; then
-          JAVADOC_JAR="${parent}JDK/Classes/classes.jar"
-        elif test -e "/usr/libexec/java_home"; then
-          JAVADOC_JAR=`/usr/libexec/java_home`/lib/tools.jar
-        else
-          JAVADOC_JAR="$parent/lib/tools.jar"
-        fi
-      ;;
-
       *)
         parent=`dirname "$JAVAC"`
 
@@ -282,6 +207,11 @@ development kit installation.
           freebsd*) JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/freebsd\"";;
           linux*)   JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/linux\"";;
           solaris*) JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/solaris\"";;
+          darwin*)  JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/darwin\"";;
+        esac
+
+        case "$host" in
+          darwin*)  JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/darwin\"";;
         esac
       ;;
     esac
diff --git a/configure b/configure
index f554af0451..842a728db8 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #! /bin/sh
 # From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libSBML 5.20.4.
+# Generated by GNU Autoconf 2.72 for libSBML 5.20.4.
 #
 # Report bugs to <libsbml-team@googlegroups.com>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
 # Inc.
 #
 #
@@ -18,7 +18,6 @@
 
 # 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 :
   emulate sh
@@ -27,12 +26,13 @@ then :
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else $as_nop
-  case `(set -o) 2>/dev/null` in #(
+else case e in #(
+  e) case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
+esac ;;
 esac
 fi
 
@@ -104,7 +104,7 @@ IFS=$as_save_IFS
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
@@ -134,15 +134,14 @@ case $- in # ((((
 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'.
+# out after a failed 'exec'.
 printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 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
+  as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
 then :
   emulate sh
   NULLCMD=:
@@ -150,12 +149,13 @@ then :
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else \$as_nop
-  case \`(set -o) 2>/dev/null\` in #(
+else case e in #(
+  e) case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
+esac ;;
 esac
 fi
 "
@@ -173,8 +173,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
 if ( set x; as_fn_ret_success y && test x = \"\$1\" )
 then :
 
-else \$as_nop
-  exitcode=1; echo positional parameters were not saved.
+else case e in #(
+  e) exitcode=1; echo positional parameters were not saved. ;;
+esac
 fi
 test x\$exitcode = x0 || exit 1
 blah=\$(echo \$(echo blah))
@@ -188,14 +189,15 @@ test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null
 then :
   as_have_required=yes
-else $as_nop
-  as_have_required=no
+else case e in #(
+  e) as_have_required=no ;;
+esac
 fi
   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
 then :
 
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
@@ -228,12 +230,13 @@ IFS=$as_save_IFS
 if $as_found
 then :
 
-else $as_nop
-  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+else case e in #(
+  e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
 	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
 then :
   CONFIG_SHELL=$SHELL as_have_required=yes
-fi
+fi ;;
+esac
 fi
 
 
@@ -255,7 +258,7 @@ case $- in # ((((
 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'.
+# out after a failed 'exec'.
 printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
@@ -275,7 +278,8 @@ $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
   fi
   exit 1
-fi
+fi ;;
+esac
 fi
 fi
 SHELL=${CONFIG_SHELL-/bin/sh}
@@ -314,14 +318,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
 # -------------
@@ -390,11 +386,12 @@ then :
   {
     eval $1+=\$2
   }'
-else $as_nop
-  as_fn_append ()
+else case e in #(
+  e) as_fn_append ()
   {
     eval $1=\$$1\$2
-  }
+  } ;;
+esac
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -408,21 +405,14 @@ then :
   {
     as_val=$(( $* ))
   }'
-else $as_nop
-  as_fn_arith ()
+else case e in #(
+  e) as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  }
+  } ;;
+esac
 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]
 # ----------------------------------------
@@ -496,6 +486,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
     /[$]LINENO/=
   ' <$as_myself |
     sed '
+      t clear
+      :clear
       s/[$]LINENO.*/&-/
       t lineno
       b
@@ -544,7 +536,6 @@ esac
 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
@@ -556,9 +547,9 @@ if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -583,10 +574,12 @@ as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 
@@ -1222,7 +1215,7 @@ 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'`
     case $ac_user_opts in
@@ -1248,7 +1241,7 @@ 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'`
     case $ac_user_opts in
@@ -1461,7 +1454,7 @@ 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'`
     case $ac_user_opts in
@@ -1477,7 +1470,7 @@ 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'`
     case $ac_user_opts in
@@ -1507,8 +1500,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error $? "unrecognized option: '$ac_option'
+Try '$0 --help' for more information"
     ;;
 
   *=*)
@@ -1516,7 +1509,7 @@ Try \`$0 --help' for more information"
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1566,7 +1559,7 @@ do
   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
-# There might be people who depend on the old broken behavior: `$host'
+# There might be people who depend on the old broken behavior: '$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 build=$build_alias
@@ -1634,7 +1627,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work"
 ac_abs_confdir=`(
 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
@@ -1662,7 +1655,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libSBML 5.20.4 to adapt to many kinds of systems.
+'configure' configures libSBML 5.20.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1676,11 +1669,11 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print 'checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -C, --config-cache      alias for '--cache-file=config.cache'
   -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+      --srcdir=DIR        find the sources in DIR [configure dir or '..']
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -1688,10 +1681,10 @@ Installation directories:
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           [PREFIX]
 
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
+By default, 'make install' will install all the files in
+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than '$ac_default_prefix' using '--prefix',
+for instance '--prefix=\$HOME'.
 
 For better control, use the options below.
 
@@ -1817,7 +1810,7 @@ Some influential environment variables:
   F77         Fortran 77 compiler command
   FFLAGS      Fortran 77 compiler flags
 
-Use these variables to override the choices made by `configure' or to help
+Use these variables to override the choices made by 'configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <libsbml-team@googlegroups.com>.
@@ -1886,9 +1879,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libSBML configure 5.20.4
-generated by GNU Autoconf 2.71
+generated by GNU Autoconf 2.72
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2023 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1927,11 +1920,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        } && test -s conftest.$ac_objext
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -1966,11 +1960,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        } && test -s conftest.$ac_objext
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2004,11 +1999,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1
+    ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2046,11 +2042,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -2074,8 +2071,8 @@ printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
@@ -2083,10 +2080,12 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no" ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2106,15 +2105,15 @@ printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-   which can conflict with char $2 (); below.  */
+   which can conflict with char $2 (void); below.  */
 
 #include <limits.h>
 #undef $2
@@ -2125,7 +2124,7 @@ else $as_nop
 #ifdef __cplusplus
 extern "C"
 #endif
-char $2 ();
+char $2 (void);
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
@@ -2144,11 +2143,13 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2184,11 +2185,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1
+    ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2226,11 +2228,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -2270,11 +2273,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        } && test -s conftest.$ac_objext
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2312,11 +2316,12 @@ printf "%s\n" "$ac_try_echo"; } >&5
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -2358,12 +2363,13 @@ printf "%s\n" "$ac_try_echo"; } >&5
   test $ac_status = 0; }; }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
        printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_retval=$ac_status
+       ac_retval=$ac_status ;;
+esac
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
@@ -2383,8 +2389,8 @@ printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
@@ -2392,10 +2398,12 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no" ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2416,8 +2424,8 @@ printf %s "checking for $2... " >&6; }
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
@@ -2447,12 +2455,14 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  eval "$3=yes"
+else case e in #(
+  e) eval "$3=yes" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam 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.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2485,7 +2495,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by libSBML $as_me 5.20.4, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -2731,10 +2741,10 @@ esac
 printf "%s\n" "$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;}
+      || { { 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 $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2986,9 +2996,7 @@ 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;
+static char *e (char **p, int i)
 {
   return p[i];
 }
@@ -3002,6 +3010,21 @@ static char *f (char * (*g) (char **, int), char **p, ...)
   return s;
 }
 
+/* C89 style stringification. */
+#define noexpand_stringify(a) #a
+const char *stringified = noexpand_stringify(arbitrary+token=sequence);
+
+/* C89 style token pasting.  Exercises some of the corner cases that
+   e.g. old MSVC gets wrong, but not very hard. */
+#define noexpand_concat(a,b) a##b
+#define expand_concat(a,b) noexpand_concat(a,b)
+extern int vA;
+extern int vbee;
+#define aye A
+#define bee B
+int *pvA = &expand_concat(v,aye);
+int *pvbee = &noexpand_concat(v,bee);
+
 /* 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
@@ -3029,16 +3052,19 @@ 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?
+/* Does the compiler advertise C99 conformance? */
 #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
 # error "Compiler does not advertise C99 conformance"
 #endif
 
+// See if C++-style comments work.
+
 #include <stdbool.h>
 extern int puts (const char *);
 extern int printf (const char *, ...);
 extern int dprintf (int, const char *, ...);
 extern void *malloc (size_t);
+extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
@@ -3088,7 +3114,6 @@ 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)
@@ -3154,6 +3179,8 @@ ac_c_conftest_c99_main='
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
+  // Work around memory leak warnings.
+  free (ia);
 
   // Check named initializers.
   struct named_init ni = {
@@ -3175,7 +3202,7 @@ ac_c_conftest_c99_main='
 
 # Test code for whether the C compiler supports C11 (global declarations)
 ac_c_conftest_c11_globals='
-// Does the compiler advertise C11 conformance?
+/* Does the compiler advertise C11 conformance? */
 #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
 # error "Compiler does not advertise C11 conformance"
 #endif
@@ -3367,8 +3394,9 @@ IFS=$as_save_IFS
 if $as_found
 then :
 
-else $as_nop
-  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+else case e in #(
+  e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
+esac
 fi
 
 
@@ -3396,12 +3424,12 @@ for ac_var in $ac_precious_vars; do
   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;}
+      { 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;}
+      { 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=: ;;
     ,);;
     *)
@@ -3410,18 +3438,18 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 	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;}
+	  { 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;}
+	  { 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;}
+	{ 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.
@@ -3437,11 +3465,11 @@ printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
   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: 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'
+  as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
 ## -------------------- ##
@@ -3469,7 +3497,7 @@ ac_config_headers="$ac_config_headers src/sbml/common/libsbml-package.h"
 ac_config_headers="$ac_config_headers src/sbml/common/libsbml-namespace.h"
 
 
-LIBSBML_VERSION_NUMERIC=52002
+LIBSBML_VERSION_NUMERIC=52004
 
 
 
@@ -3481,7 +3509,7 @@ LIBSBML_MINOR_VERSION=20
 
 
 
-LIBSBML_REVISION_VERSION=0
+LIBSBML_REVISION_VERSION=4
 
 
 
@@ -3498,8 +3526,9 @@ LIBSBML_BETA_VERSION=
 if test ${enable_cpp_namespace+y}
 then :
   enableval=$enable_cpp_namespace; enable_cpp_namespace=$enableval
-else $as_nop
-  enable_cpp_namespace=no
+else case e in #(
+  e) enable_cpp_namespace=no ;;
+esac
 fi
 
 
@@ -3514,8 +3543,9 @@ fi
 if test ${enable_layout+y}
 then :
   enableval=$enable_layout; enable_layout=$enableval
-else $as_nop
-  enable_layout=no
+else case e in #(
+  e) enable_layout=no ;;
+esac
 fi
 
 
@@ -3536,8 +3566,9 @@ fi
 if test ${enable_render+y}
 then :
   enableval=$enable_render; enable_render=$enableval
-else $as_nop
-  enable_render=no
+else case e in #(
+  e) enable_render=no ;;
+esac
 fi
 
 
@@ -3558,8 +3589,9 @@ fi
 if test ${enable_comp+y}
 then :
   enableval=$enable_comp; enable_comp=$enableval
-else $as_nop
-  enable_comp=no
+else case e in #(
+  e) enable_comp=no ;;
+esac
 fi
 
 
@@ -3580,8 +3612,9 @@ fi
 if test ${enable_fbc+y}
 then :
   enableval=$enable_fbc; enable_fbc=$enableval
-else $as_nop
-  enable_fbc=no
+else case e in #(
+  e) enable_fbc=no ;;
+esac
 fi
 
 
@@ -3602,8 +3635,9 @@ fi
 if test ${enable_qual+y}
 then :
   enableval=$enable_qual; enable_qual=$enableval
-else $as_nop
-  enable_qual=no
+else case e in #(
+  e) enable_qual=no ;;
+esac
 fi
 
 
@@ -3624,8 +3658,9 @@ fi
 if test ${enable_groups+y}
 then :
   enableval=$enable_groups; enable_groups=$enableval
-else $as_nop
-  enable_groups=no
+else case e in #(
+  e) enable_groups=no ;;
+esac
 fi
 
 
@@ -3646,8 +3681,9 @@ fi
 if test ${enable_multi+y}
 then :
   enableval=$enable_multi; enable_multi=$enableval
-else $as_nop
-  enable_multi=no
+else case e in #(
+  e) enable_multi=no ;;
+esac
 fi
 
 
@@ -3668,8 +3704,9 @@ fi
 if test ${enable_l3v2extendedmath+y}
 then :
   enableval=$enable_l3v2extendedmath; enable_l3v2extendedmath=$enableval
-else $as_nop
-  enable_l3v2extendedmath=no
+else case e in #(
+  e) enable_l3v2extendedmath=no ;;
+esac
 fi
 
 
@@ -3832,8 +3869,9 @@ PACKAGE_SPATIAL_ERRATA_URL=https://github.com/sbmlteam/sbml-specifications/issue
 if test ${enable_compression+y}
 then :
   enableval=$enable_compression; enable_compression=$enableval
-else $as_nop
-  enable_compression=yes
+else case e in #(
+  e) enable_compression=yes ;;
+esac
 fi
 
 
@@ -3850,8 +3888,9 @@ fi
 if test ${enable_shared_version+y}
 then :
   enableval=$enable_shared_version; enable_shared_version=$enableval
-else $as_nop
-  enable_shared_version=yes
+else case e in #(
+  e) enable_shared_version=yes ;;
+esac
 fi
 
 
@@ -3868,8 +3907,9 @@ fi
 if test ${enable_strict_includes+y}
 then :
   enableval=$enable_strict_includes; enable_use_strict_includes=$enableval
-else $as_nop
-  enable_use_strict_includes=no
+else case e in #(
+  e) enable_use_strict_includes=no ;;
+esac
 fi
 
 
@@ -3897,15 +3937,16 @@ printf %s "checking build system type... " >&6; }
 if test ${ac_cv_build+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_build_alias=$build_alias
+else case e in #(
+  e) ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
   as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 printf "%s\n" "$ac_cv_build" >&6; }
@@ -3932,14 +3973,15 @@ printf %s "checking host system type... " >&6; }
 if test ${ac_cv_host+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "x$host_alias" = x; then
+else case e in #(
+  e) if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
     as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 printf "%s\n" "$ac_cv_host" >&6; }
@@ -3982,8 +4024,9 @@ fi
 if test ${enable_universal_binary+y}
 then :
   enableval=$enable_universal_binary; enable_univbinary=$enableval
-else $as_nop
-  enable_univbinary=no
+else case e in #(
+  e) enable_univbinary=no ;;
+esac
 fi
 
 
@@ -4171,8 +4214,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_CXX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CXX"; then
+else case e in #(
+  e) if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4194,7 +4237,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
@@ -4220,8 +4264,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_CXX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CXX"; then
+else case e in #(
+  e) if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4243,7 +4287,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
@@ -4343,8 +4388,8 @@ printf "%s\n" "$ac_try_echo"; } >&5
   printf "%s\n" "$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'
+  # 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,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
@@ -4364,7 +4409,7 @@ do
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
+	# safe: cross compilers may not add the suffix if given an '-o'
 	# argument, so we may need to know it at that point already.
 	# Even if this section looks crufty: it has the advantage of
 	# actually working.
@@ -4375,8 +4420,9 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else $as_nop
-  ac_file=''
+else case e in #(
+  e) ac_file='' ;;
+esac
 fi
 if test -z "$ac_file"
 then :
@@ -4385,13 +4431,14 @@ printf "%s\n" "no" >&6; }
 printf "%s\n" "$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;}
+{ { 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 "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; }
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; } ;;
+esac
 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; }
@@ -4415,10 +4462,10 @@ printf "%s\n" "$ac_try_echo"; } >&5
   printf "%s\n" "$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
-# `rm'.
+  # 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
+# 'rm'.
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -4428,11 +4475,12 @@ 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 case e in #(
+  e) { { 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 $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 rm -f conftest conftest$ac_cv_exeext
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4448,6 +4496,8 @@ int
 main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
+ if (!f)
+  return 1;
  return ferror (f) || fclose (f) != 0;
 
   ;
@@ -4487,26 +4537,27 @@ printf "%s\n" "$ac_try_echo"; } >&5
     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;}
+	{ { 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.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+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; }
 
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext \
+  conftest.o conftest.obj 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
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4538,16 +4589,18 @@ then :
        break;;
   esac
 done
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$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;}
+{ { 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 $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 printf "%s\n" "$ac_cv_objext" >&6; }
@@ -4558,8 +4611,8 @@ printf %s "checking whether the compiler supports GNU C++... " >&6; }
 if test ${ac_cv_cxx_compiler_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4576,12 +4629,14 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else $as_nop
-  ac_compiler_gnu=no
+else case e in #(
+  e) ac_compiler_gnu=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
 printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
@@ -4599,8 +4654,8 @@ printf %s "checking whether $CXX accepts -g... " >&6; }
 if test ${ac_cv_prog_cxx_g+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+else case e in #(
+  e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
@@ -4618,8 +4673,8 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_cv_prog_cxx_g=yes
-else $as_nop
-  CXXFLAGS=""
+else case e in #(
+  e) CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -4634,8 +4689,8 @@ _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
 
-else $as_nop
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else case e in #(
+  e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4652,12 +4707,15 @@ if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_cv_prog_cxx_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.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
 printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
@@ -4681,11 +4739,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cxx_11=no
+else case e in #(
+  e) ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4702,36 +4760,39 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CXX=$ac_save_CXX
+CXX=$ac_save_CXX ;;
+esac
 fi
 
 if test "x$ac_cv_prog_cxx_cxx11" = 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_cxx_cxx11" = x
+else case e in #(
+  e) if test "x$ac_cv_prog_cxx_cxx11" = 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_cxx_cxx11" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
 printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx11"
+     CXX="$CXX $ac_cv_prog_cxx_cxx11" ;;
+esac
 fi
   ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11
+  ac_prog_cxx_stdcxx=cxx11 ;;
+esac
 fi
 fi
 if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cxx_98=no
+else case e in #(
+  e) ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4748,25 +4809,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CXX=$ac_save_CXX
+CXX=$ac_save_CXX ;;
+esac
 fi
 
 if test "x$ac_cv_prog_cxx_cxx98" = 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_cxx_cxx98" = x
+else case e in #(
+  e) if test "x$ac_cv_prog_cxx_cxx98" = 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_cxx_cxx98" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
 printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx98"
+     CXX="$CXX $ac_cv_prog_cxx_cxx98" ;;
+esac
 fi
   ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98
+  ac_prog_cxx_stdcxx=cxx98 ;;
+esac
 fi
 fi
 
@@ -4798,8 +4862,8 @@ 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
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4821,7 +4885,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -4843,8 +4908,8 @@ 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
+else case e in #(
+  e) 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
@@ -4866,7 +4931,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
@@ -4901,8 +4967,8 @@ 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
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4924,7 +4990,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -4946,8 +5013,8 @@ 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
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
@@ -4986,7 +5053,8 @@ if test $ac_prog_rejected = yes; then
     ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -5010,8 +5078,8 @@ 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
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5033,7 +5101,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -5059,8 +5128,8 @@ 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
+else case e in #(
+  e) 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
@@ -5082,7 +5151,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
@@ -5120,8 +5190,8 @@ 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
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5143,7 +5213,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -5165,8 +5236,8 @@ 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
+else case e in #(
+  e) 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
@@ -5188,7 +5259,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
@@ -5217,10 +5289,10 @@ 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" && { { 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 $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+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
@@ -5252,8 +5324,8 @@ 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
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5270,12 +5342,14 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else $as_nop
-  ac_compiler_gnu=no
+else case e in #(
+  e) ac_compiler_gnu=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 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; }
@@ -5293,8 +5367,8 @@ printf %s "checking whether $CC accepts -g... " >&6; }
 if test ${ac_cv_prog_cc_g+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_save_c_werror_flag=$ac_c_werror_flag
+else case e in #(
+  e) ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
@@ -5312,8 +5386,8 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_prog_cc_g=yes
-else $as_nop
-  CFLAGS=""
+else case e in #(
+  e) CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5328,8 +5402,8 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  ac_c_werror_flag=$ac_save_c_werror_flag
+else case e in #(
+  e) ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5346,12 +5420,15 @@ 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.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
+   ac_c_werror_flag=$ac_save_c_werror_flag ;;
+esac
 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; }
@@ -5378,8 +5455,8 @@ 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
+else case e in #(
+  e) ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5396,25 +5473,28 @@ 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
+CC=$ac_save_CC ;;
+esac
 fi
 
 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
+else case e in #(
+  e) 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
+else case e in #(
+  e) { 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"
+     CC="$CC $ac_cv_prog_cc_c11" ;;
+esac
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11
+  ac_prog_cc_stdc=c11 ;;
+esac
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
@@ -5424,8 +5504,8 @@ 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
+else case e in #(
+  e) ac_cv_prog_cc_c99=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5442,25 +5522,28 @@ 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
+CC=$ac_save_CC ;;
+esac
 fi
 
 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
+else case e in #(
+  e) 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
+else case e in #(
+  e) { 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"
+     CC="$CC $ac_cv_prog_cc_c99" ;;
+esac
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99
+  ac_prog_cc_stdc=c99 ;;
+esac
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
@@ -5470,8 +5553,8 @@ 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
+else case e in #(
+  e) ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5488,25 +5571,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
 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
+else case e in #(
+  e) 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
+else case e in #(
+  e) { 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"
+     CC="$CC $ac_cv_prog_cc_c89" ;;
+esac
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89
+  ac_prog_cc_stdc=c89 ;;
+esac
 fi
 fi
 
@@ -5531,8 +5617,8 @@ if test -z "$CPP"; then
   if test ${ac_cv_prog_CPP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-      # Double quotes because $CC needs to be expanded
+else case e in #(
+  e)     # Double quotes because $CC needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
@@ -5550,9 +5636,10 @@ _ACEOF
 if ac_fn_c_try_cpp "$LINENO"
 then :
 
-else $as_nop
-  # Broken: fails on valid input.
-continue
+else case e in #(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5566,15 +5653,16 @@ if ac_fn_c_try_cpp "$LINENO"
 then :
   # Broken: success on invalid input.
 continue
-else $as_nop
-  # Passes both tests.
+else case e in #(
+  e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# 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 :
@@ -5583,7 +5671,8 @@ fi
 
     done
     ac_cv_prog_CPP=$CPP
-
+   ;;
+esac
 fi
   CPP=$ac_cv_prog_CPP
 else
@@ -5606,9 +5695,10 @@ _ACEOF
 if ac_fn_c_try_cpp "$LINENO"
 then :
 
-else $as_nop
-  # Broken: fails on valid input.
-continue
+else case e in #(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5622,24 +5712,26 @@ if ac_fn_c_try_cpp "$LINENO"
 then :
   # Broken: success on invalid input.
 continue
-else $as_nop
-  # Passes both tests.
+else case e in #(
+  e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# 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_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 case e in #(
+  e) { { 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 $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 
 ac_ext=c
@@ -5671,8 +5763,8 @@ if test -z "$INSTALL"; then
 if test ${ac_cv_path_install+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
@@ -5726,7 +5818,8 @@ esac
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
-
+ ;;
+esac
 fi
   if test ${ac_cv_path_install+y}; then
     INSTALL=$ac_cv_path_install
@@ -5756,8 +5849,8 @@ ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat >conftest.make <<\_ACEOF
+else case e in #(
+  e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
@@ -5769,7 +5862,8 @@ case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *)
     eval ac_cv_prog_make_${ac_make}_set=no;;
 esac
-rm -f conftest.make
+rm -f conftest.make ;;
+esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -5789,8 +5883,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_AUTOCONF+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $AUTOCONF in
+else case e in #(
+  e) case $AUTOCONF in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_AUTOCONF="$AUTOCONF" # Let the user override the test with a path.
   ;;
@@ -5816,6 +5910,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_AUTOCONF" && ac_cv_path_AUTOCONF="autoconf"
   ;;
+esac ;;
 esac
 fi
 AUTOCONF=$ac_cv_path_AUTOCONF
@@ -5835,8 +5930,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_ACLOCAL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $ACLOCAL in
+else case e in #(
+  e) case $ACLOCAL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ACLOCAL="$ACLOCAL" # Let the user override the test with a path.
   ;;
@@ -5862,6 +5957,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_ACLOCAL" && ac_cv_path_ACLOCAL="aclocal"
   ;;
+esac ;;
 esac
 fi
 ACLOCAL=$ac_cv_path_ACLOCAL
@@ -5892,10 +5988,11 @@ then :
 
    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-
+ ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 CPPFLAGS=$saved_CPPFLAGS
@@ -5910,8 +6007,9 @@ CPPFLAGS=$saved_CPPFLAGS
 if test ${with_python+y}
 then :
   withval=$with_python; with_python=$withval
-else $as_nop
-  with_python=no
+else case e in #(
+  e) with_python=no ;;
+esac
 fi
 
 
@@ -5920,8 +6018,9 @@ fi
 if test ${with_python_interpreter+y}
 then :
   withval=$with_python_interpreter; PYTHON=$withval
-else $as_nop
-  PYTHON=no
+else case e in #(
+  e) PYTHON=no ;;
+esac
 fi
 
 
@@ -6005,8 +6104,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_PYTHON+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $PYTHON in
+else case e in #(
+  e) case $PYTHON in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
   ;;
@@ -6032,6 +6131,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="no"
   ;;
+esac ;;
 esac
 fi
 PYTHON=$ac_cv_path_PYTHON
@@ -6052,8 +6152,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_PYTHON+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $PYTHON in
+else case e in #(
+  e) case $PYTHON in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
   ;;
@@ -6078,6 +6178,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 PYTHON=$ac_cv_path_PYTHON
@@ -6168,8 +6269,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_PYTHON_CONFIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $PYTHON_CONFIG in
+else case e in #(
+  e) case $PYTHON_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PYTHON_CONFIG="$PYTHON_CONFIG" # Let the user override the test with a path.
   ;;
@@ -6195,6 +6296,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PYTHON_CONFIG" && ac_cv_path_PYTHON_CONFIG="no"
   ;;
+esac ;;
 esac
 fi
 PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
@@ -6215,8 +6317,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_PYTHON_CONFIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $PYTHON_CONFIG in
+else case e in #(
+  e) case $PYTHON_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PYTHON_CONFIG="$PYTHON_CONFIG" # Let the user override the test with a path.
   ;;
@@ -6241,6 +6343,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
@@ -6710,8 +6813,9 @@ printf "%s\n" "#define USE_PYTHON 1" >>confdefs.h
 if test ${with_perl+y}
 then :
   withval=$with_perl; with_perl=$withval
-else $as_nop
-  with_perl=no
+else case e in #(
+  e) with_perl=no ;;
+esac
 fi
 
 
@@ -6726,8 +6830,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_PERL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $PERL in
+else case e in #(
+  e) case $PERL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
   ;;
@@ -6753,6 +6857,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
   ;;
+esac ;;
 esac
 fi
 PERL=$ac_cv_path_PERL
@@ -6773,8 +6878,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_PERL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $PERL in
+else case e in #(
+  e) case $PERL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
   ;;
@@ -6799,6 +6904,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 PERL=$ac_cv_path_PERL
@@ -6862,8 +6968,9 @@ printf "%s\n" "#define USE_PERL 1" >>confdefs.h
 if test ${with_java+y}
 then :
   withval=$with_java; with_java=$withval
-else $as_nop
-  with_java=no
+else case e in #(
+  e) with_java=no ;;
+esac
 fi
 
 
@@ -6893,8 +7000,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_JAVA+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $JAVA in
+else case e in #(
+  e) case $JAVA in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_JAVA="$JAVA" # Let the user override the test with a path.
   ;;
@@ -6920,6 +7027,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_JAVA" && ac_cv_path_JAVA="no"
   ;;
+esac ;;
 esac
 fi
 JAVA=$ac_cv_path_JAVA
@@ -6939,8 +7047,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_JAVAC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $JAVAC in
+else case e in #(
+  e) case $JAVAC in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
   ;;
@@ -6966,6 +7074,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_JAVAC" && ac_cv_path_JAVAC="no"
   ;;
+esac ;;
 esac
 fi
 JAVAC=$ac_cv_path_JAVAC
@@ -6985,8 +7094,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_JAR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $JAR in
+else case e in #(
+  e) case $JAR in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_JAR="$JAR" # Let the user override the test with a path.
   ;;
@@ -7012,6 +7121,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_JAR" && ac_cv_path_JAR="no"
   ;;
+esac ;;
 esac
 fi
 JAR=$ac_cv_path_JAR
@@ -7033,8 +7143,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_JAVA+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $JAVA in
+else case e in #(
+  e) case $JAVA in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_JAVA="$JAVA" # Let the user override the test with a path.
   ;;
@@ -7059,6 +7169,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 JAVA=$ac_cv_path_JAVA
@@ -7078,8 +7189,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_JAVAC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $JAVAC in
+else case e in #(
+  e) case $JAVAC in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
   ;;
@@ -7104,6 +7215,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 JAVAC=$ac_cv_path_JAVAC
@@ -7123,8 +7235,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_JAR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $JAR in
+else case e in #(
+  e) case $JAR in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_JAR="$JAR" # Let the user override the test with a path.
   ;;
@@ -7149,6 +7261,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 JAR=$ac_cv_path_JAR
@@ -7233,81 +7346,6 @@ printf "%s\n" "no" >&6; }
 
 
     case "$host" in
-      *darwin*)
-        framework="/System/Library/Frameworks/JavaVM.framework"
-        case $JAVA_VERSION in
-          9)
-            if test -e "$framework/Versions/Current/Headers"; then
-              headers="$framework/Versions/Current/Headers"
-            elif test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            fi
-            ;;
-          8)
-            if test -e "$framework/Versions/Current/Headers"; then
-              headers="$framework/Versions/Current/Headers"
-            elif test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            fi
-            ;;
-          7)
-            if test -e "$framework/Versions/Current/Headers"; then
-              headers="$framework/Versions/Current/Headers"
-            elif test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            elif test -e "$framework/Versions/1.7.0/Headers"; then
-              headers="$framework/Versions/1.7.0/Headers"
-            elif test -e "$framework/Versions/1.7/Headers"; then
-              headers="$framework/Versions/1.7/Headers"
-            fi
-            ;;
-          6)
-            if test -e "$framework/Versions/Current/Headers"; then
-              headers="$framework/Versions/Current/Headers"
-            elif test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            elif test -e "$framework/Versions/1.6.0/Headers"; then
-              headers="$framework/Versions/1.6.0/Headers"
-            elif test -e "$framework/Versions/1.6/Headers"; then
-              headers="$framework/Versions/1.6/Headers"
-            fi
-            ;;
-          5)
-            if test -e "$framework/Versions/CurrentJDK/Headers"; then
-              headers="$framework/Versions/CurrentJDK/Headers"
-            elif test -e "$framework/Versions/1.5.0/Headers"; then
-              headers="$framework/Versions/1.5.0/Headers"
-            elif test -e "$framework/Versions/1.5/Headers"; then
-              headers="$framework/Versions/1.5/Headers"
-            fi
-            ;;
-        esac
-
-        if ! test -e "$headers/jni.h"; then
-          as_fn_error $? "
-Cannot find Java include files. Your environment may lack a Java
-development kit installation.
-" "$LINENO" 5
-        fi
-
-        JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$headers\""
-
-        parent=`dirname "$headers"`
-        if test $JAVA_VERSION -ge 9; then
-	  JAVADOC_JAR=
-        elif test -e "$parent/Classes/classes.jar"; then
-          JAVADOC_JAR="$parent/Classes/classes.jar"
-        elif test -e "$parent/Classes/tools.jar"; then
-          JAVADOC_JAR="$parent/Classes/tools.jar"
-        elif test -e "${parent}JDK/Classes/classes.jar"; then
-          JAVADOC_JAR="${parent}JDK/Classes/classes.jar"
-        elif test -e "/usr/libexec/java_home"; then
-          JAVADOC_JAR=`/usr/libexec/java_home`/lib/tools.jar
-        else
-          JAVADOC_JAR="$parent/lib/tools.jar"
-        fi
-      ;;
-
       *)
         parent=`dirname "$JAVAC"`
 
@@ -7344,6 +7382,11 @@ development kit installation.
           freebsd*) JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/freebsd\"";;
           linux*)   JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/linux\"";;
           solaris*) JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/solaris\"";;
+          darwin*)  JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/darwin\"";;
+        esac
+
+        case "$host" in
+          darwin*)  JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I\"$parent/include/darwin\"";;
         esac
       ;;
     esac
@@ -7795,8 +7838,9 @@ printf "%s\n" "#define USE_JAVA 1" >>confdefs.h
 if test ${with_matlab+y}
 then :
   withval=$with_matlab; with_matlab=$withval
-else $as_nop
-  with_matlab=no
+else case e in #(
+  e) with_matlab=no ;;
+esac
 fi
 
 
@@ -7813,8 +7857,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MATLAB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $MATLAB in
+else case e in #(
+  e) case $MATLAB in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_MATLAB="$MATLAB" # Let the user override the test with a path.
   ;;
@@ -7840,6 +7884,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_MATLAB" && ac_cv_path_MATLAB="no"
   ;;
+esac ;;
 esac
 fi
 MATLAB=$ac_cv_path_MATLAB
@@ -7860,8 +7905,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MATLAB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $MATLAB in
+else case e in #(
+  e) case $MATLAB in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_MATLAB="$MATLAB" # Let the user override the test with a path.
   ;;
@@ -7886,6 +7931,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 MATLAB=$ac_cv_path_MATLAB
@@ -7922,8 +7968,9 @@ printf "%s\n" "#define USE_MATLAB 1" >>confdefs.h
 if test ${with_octave+y}
 then :
   withval=$with_octave; with_octave=$withval
-else $as_nop
-  with_octave=no
+else case e in #(
+  e) with_octave=no ;;
+esac
 fi
 
 
@@ -7939,8 +7986,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_OCTAVE+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $OCTAVE in
+else case e in #(
+  e) case $OCTAVE in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_OCTAVE="$OCTAVE" # Let the user override the test with a path.
   ;;
@@ -7966,6 +8013,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_OCTAVE" && ac_cv_path_OCTAVE="no"
   ;;
+esac ;;
 esac
 fi
 OCTAVE=$ac_cv_path_OCTAVE
@@ -7985,8 +8033,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MKOCTFILE+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $MKOCTFILE in
+else case e in #(
+  e) case $MKOCTFILE in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_MKOCTFILE="$MKOCTFILE" # Let the user override the test with a path.
   ;;
@@ -8012,6 +8060,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_MKOCTFILE" && ac_cv_path_MKOCTFILE="no"
   ;;
+esac ;;
 esac
 fi
 MKOCTFILE=$ac_cv_path_MKOCTFILE
@@ -8031,8 +8080,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_OCTAVE_CONFIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $OCTAVE_CONFIG in
+else case e in #(
+  e) case $OCTAVE_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_OCTAVE_CONFIG="$OCTAVE_CONFIG" # Let the user override the test with a path.
   ;;
@@ -8058,6 +8107,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_OCTAVE_CONFIG" && ac_cv_path_OCTAVE_CONFIG="no"
   ;;
+esac ;;
 esac
 fi
 OCTAVE_CONFIG=$ac_cv_path_OCTAVE_CONFIG
@@ -8078,8 +8128,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_OCTAVE+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $OCTAVE in
+else case e in #(
+  e) case $OCTAVE in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_OCTAVE="$OCTAVE" # Let the user override the test with a path.
   ;;
@@ -8104,6 +8154,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 OCTAVE=$ac_cv_path_OCTAVE
@@ -8123,8 +8174,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_MKOCTFILE+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $MKOCTFILE in
+else case e in #(
+  e) case $MKOCTFILE in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_MKOCTFILE="$MKOCTFILE" # Let the user override the test with a path.
   ;;
@@ -8149,6 +8200,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 MKOCTFILE=$ac_cv_path_MKOCTFILE
@@ -8168,8 +8220,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_OCTAVE_CONFIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $OCTAVE_CONFIG in
+else case e in #(
+  e) case $OCTAVE_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_OCTAVE_CONFIG="$OCTAVE_CONFIG" # Let the user override the test with a path.
   ;;
@@ -8194,6 +8246,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 OCTAVE_CONFIG=$ac_cv_path_OCTAVE_CONFIG
@@ -8327,8 +8380,9 @@ printf "%s\n" "#define USE_OCTAVE 1" >>confdefs.h
 if test ${with_ruby+y}
 then :
   withval=$with_ruby; with_ruby=$withval
-else $as_nop
-  with_ruby=no
+else case e in #(
+  e) with_ruby=no ;;
+esac
 fi
 
 
@@ -8348,8 +8402,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_RUBY+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $RUBY in
+else case e in #(
+  e) case $RUBY in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
   ;;
@@ -8374,6 +8428,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 RUBY=$ac_cv_path_RUBY
@@ -8400,8 +8455,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_RUBY+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $RUBY in
+else case e in #(
+  e) case $RUBY in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
   ;;
@@ -8426,6 +8481,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 RUBY=$ac_cv_path_RUBY
@@ -8853,8 +8909,9 @@ printf "%s\n" "#define USE_RUBY 1" >>confdefs.h
 if test ${with_csharp+y}
 then :
   withval=$with_csharp; with_csharp="$withval"
-else $as_nop
-  with_csharp=no
+else case e in #(
+  e) with_csharp=no ;;
+esac
 fi
 
 
@@ -8863,8 +8920,9 @@ fi
 if test ${with_cil_interpreter+y}
 then :
   withval=$with_cil_interpreter; CSHARP_BIN="$withval"
-else $as_nop
-  CSHARP_BIN=
+else case e in #(
+  e) CSHARP_BIN= ;;
+esac
 fi
 
 
@@ -8873,8 +8931,9 @@ fi
 if test ${with_csharp_compiler+y}
 then :
   withval=$with_csharp_compiler; CSHARP_COMPILERBIN="$withval"
-else $as_nop
-  CSHARP_COMPILERBIN=
+else case e in #(
+  e) CSHARP_COMPILERBIN= ;;
+esac
 fi
 
 
@@ -8900,8 +8959,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_COMPILER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_COMPILER in
+else case e in #(
+  e) case $CSHARP_COMPILER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_COMPILER="$CSHARP_COMPILER" # Let the user override the test with a path.
   ;;
@@ -8926,6 +8985,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_COMPILER=$ac_cv_path_CSHARP_COMPILER
@@ -8951,8 +9011,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_COMPILER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_COMPILER in
+else case e in #(
+  e) case $CSHARP_COMPILER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_COMPILER="$CSHARP_COMPILER" # Let the user override the test with a path.
   ;;
@@ -8977,6 +9037,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_COMPILER=$ac_cv_path_CSHARP_COMPILER
@@ -9011,8 +9072,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_COMPILER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_COMPILER in
+else case e in #(
+  e) case $CSHARP_COMPILER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_COMPILER="$CSHARP_COMPILER" # Let the user override the test with a path.
   ;;
@@ -9037,6 +9098,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_COMPILER=$ac_cv_path_CSHARP_COMPILER
@@ -9062,8 +9124,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_COMPILER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_COMPILER in
+else case e in #(
+  e) case $CSHARP_COMPILER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_COMPILER="$CSHARP_COMPILER" # Let the user override the test with a path.
   ;;
@@ -9088,6 +9150,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_COMPILER=$ac_cv_path_CSHARP_COMPILER
@@ -9122,8 +9185,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_COMPILER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_COMPILER in
+else case e in #(
+  e) case $CSHARP_COMPILER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_COMPILER="$CSHARP_COMPILER" # Let the user override the test with a path.
   ;;
@@ -9148,6 +9211,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_COMPILER=$ac_cv_path_CSHARP_COMPILER
@@ -9173,8 +9237,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_COMPILER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_COMPILER in
+else case e in #(
+  e) case $CSHARP_COMPILER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_COMPILER="$CSHARP_COMPILER" # Let the user override the test with a path.
   ;;
@@ -9199,6 +9263,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_COMPILER=$ac_cv_path_CSHARP_COMPILER
@@ -9251,8 +9316,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_CILINTERPRETER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_CILINTERPRETER in
+else case e in #(
+  e) case $CSHARP_CILINTERPRETER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_CILINTERPRETER="$CSHARP_CILINTERPRETER" # Let the user override the test with a path.
   ;;
@@ -9277,6 +9342,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_CILINTERPRETER=$ac_cv_path_CSHARP_CILINTERPRETER
@@ -9302,8 +9368,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_CILINTERPRETER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_CILINTERPRETER in
+else case e in #(
+  e) case $CSHARP_CILINTERPRETER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_CILINTERPRETER="$CSHARP_CILINTERPRETER" # Let the user override the test with a path.
   ;;
@@ -9328,6 +9394,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_CILINTERPRETER=$ac_cv_path_CSHARP_CILINTERPRETER
@@ -9372,8 +9439,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_CILINTERPRETER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_CILINTERPRETER in
+else case e in #(
+  e) case $CSHARP_CILINTERPRETER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_CILINTERPRETER="$CSHARP_CILINTERPRETER" # Let the user override the test with a path.
   ;;
@@ -9398,6 +9465,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_CILINTERPRETER=$ac_cv_path_CSHARP_CILINTERPRETER
@@ -9423,8 +9491,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CSHARP_CILINTERPRETER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $CSHARP_CILINTERPRETER in
+else case e in #(
+  e) case $CSHARP_CILINTERPRETER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CSHARP_CILINTERPRETER="$CSHARP_CILINTERPRETER" # Let the user override the test with a path.
   ;;
@@ -9449,6 +9517,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 CSHARP_CILINTERPRETER=$ac_cv_path_CSHARP_CILINTERPRETER
@@ -9500,8 +9569,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_SN+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $SN in
+else case e in #(
+  e) case $SN in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SN="$SN" # Let the user override the test with a path.
   ;;
@@ -9526,6 +9595,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 SN=$ac_cv_path_SN
@@ -9550,8 +9620,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_GACUTIL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $GACUTIL in
+else case e in #(
+  e) case $GACUTIL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_GACUTIL="$GACUTIL" # Let the user override the test with a path.
   ;;
@@ -9576,6 +9646,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 GACUTIL=$ac_cv_path_GACUTIL
@@ -9601,8 +9672,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_SN+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $SN in
+else case e in #(
+  e) case $SN in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SN="$SN" # Let the user override the test with a path.
   ;;
@@ -9627,6 +9698,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 SN=$ac_cv_path_SN
@@ -9652,8 +9724,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_GACUTIL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $GACUTIL in
+else case e in #(
+  e) case $GACUTIL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_GACUTIL="$GACUTIL" # Let the user override the test with a path.
   ;;
@@ -9678,6 +9750,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 GACUTIL=$ac_cv_path_GACUTIL
@@ -10053,8 +10126,9 @@ printf "%s\n" "#define USE_CSHARP 1" >>confdefs.h
 if test ${with_swig+y}
 then :
   withval=$with_swig; with_swig=$withval
-else $as_nop
-  with_swig=no
+else case e in #(
+  e) with_swig=no ;;
+esac
 fi
 
 
@@ -10072,8 +10146,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_SWIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $SWIG in
+else case e in #(
+  e) case $SWIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
   ;;
@@ -10099,6 +10173,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_SWIG" && ac_cv_path_SWIG="no"
   ;;
+esac ;;
 esac
 fi
 SWIG=$ac_cv_path_SWIG
@@ -10122,8 +10197,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_SWIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $SWIG in
+else case e in #(
+  e) case $SWIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
   ;;
@@ -10149,6 +10224,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_SWIG" && ac_cv_path_SWIG="no"
   ;;
+esac ;;
 esac
 fi
 SWIG=$ac_cv_path_SWIG
@@ -10252,8 +10328,9 @@ printf "%s\n" "#define USE_SWIG 1" >>confdefs.h
 if test ${with_doxygen+y}
 then :
   withval=$with_doxygen; with_doxygen=$withval
-else $as_nop
-  with_doxygen=no
+else case e in #(
+  e) with_doxygen=no ;;
+esac
 fi
 
 
@@ -10270,8 +10347,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_DOXYGEN+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $DOXYGEN in
+else case e in #(
+  e) case $DOXYGEN in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
   ;;
@@ -10297,6 +10374,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN="no"
   ;;
+esac ;;
 esac
 fi
 DOXYGEN=$ac_cv_path_DOXYGEN
@@ -10319,8 +10397,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_DOXYGEN+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $DOXYGEN in
+else case e in #(
+  e) case $DOXYGEN in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
   ;;
@@ -10345,6 +10423,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 DOXYGEN=$ac_cv_path_DOXYGEN
@@ -10427,8 +10506,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_DOXYINDEXER+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $DOXYINDEXER in
+else case e in #(
+  e) case $DOXYINDEXER in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_DOXYINDEXER="$DOXYINDEXER" # Let the user override the test with a path.
   ;;
@@ -10454,6 +10533,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_DOXYINDEXER" && ac_cv_path_DOXYINDEXER="no"
   ;;
+esac ;;
 esac
 fi
 DOXYINDEXER=$ac_cv_path_DOXYINDEXER
@@ -10515,8 +10595,9 @@ then :
       IFS="$lt_save_ifs"
       ;;
     esac
-else $as_nop
-  enable_shared=yes
+else case e in #(
+  e) enable_shared=yes ;;
+esac
 fi
 
 
@@ -10540,8 +10621,9 @@ then :
       IFS="$lt_save_ifs"
       ;;
     esac
-else $as_nop
-  enable_static=yes
+else case e in #(
+  e) enable_static=yes ;;
+esac
 fi
 
 
@@ -10565,8 +10647,9 @@ then :
       IFS="$lt_save_ifs"
       ;;
     esac
-else $as_nop
-  enable_fast_install=yes
+else case e in #(
+  e) enable_fast_install=yes ;;
+esac
 fi
 
 
@@ -10575,8 +10658,8 @@ printf %s "checking for a sed that does not truncate output... " >&6; }
 if test ${lt_cv_path_SED+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # Loop through the user's path and test for sed and gsed.
+else case e in #(
+  e) # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -10622,7 +10705,8 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
     fi
   done
 done
-
+ ;;
+esac
 fi
 
 SED=$lt_cv_path_SED
@@ -10635,8 +10719,8 @@ printf %s "checking for grep that handles long lines and -e... " >&6; }
 if test ${ac_cv_path_GREP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$GREP"; then
+else case e in #(
+  e) 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
@@ -10655,9 +10739,10 @@ do
       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
+case `"$ac_path_GREP" --version 2>&1` in #(
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -10692,7 +10777,8 @@ IFS=$as_save_IFS
 else
   ac_cv_path_GREP=$GREP
 fi
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 printf "%s\n" "$ac_cv_path_GREP" >&6; }
@@ -10704,8 +10790,8 @@ printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+else case e in #(
+  e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
      if test -z "$EGREP"; then
@@ -10727,9 +10813,10 @@ do
       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
+case `"$ac_path_EGREP" --version 2>&1` in #(
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -10765,20 +10852,24 @@ else
   ac_cv_path_EGREP=$EGREP
 fi
 
-   fi
+   fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 printf "%s\n" "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
+         EGREP_TRADITIONAL=$EGREP
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
 
 # Check whether --with-gnu-ld was given.
 if test ${with_gnu_ld+y}
 then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else $as_nop
-  with_gnu_ld=no
+else case e in #(
+  e) with_gnu_ld=no ;;
+esac
 fi
 
 ac_prog=ld
@@ -10823,8 +10914,8 @@ fi
 if test ${lt_cv_path_LD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$LD"; then
+else case e in #(
+  e) if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     IFS="$lt_save_ifs"
@@ -10847,7 +10938,8 @@ else $as_nop
   IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
+fi ;;
+esac
 fi
 
 LD="$lt_cv_path_LD"
@@ -10864,8 +10956,8 @@ printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+else case e in #(
+  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -10873,6 +10965,7 @@ case `$LD -v 2>&1 </dev/null` in
 *)
   lt_cv_prog_gnu_ld=no
   ;;
+esac ;;
 esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
@@ -10885,8 +10978,9 @@ printf %s "checking for $LD option to reload object files... " >&6; }
 if test ${lt_cv_ld_reload_flag+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ld_reload_flag='-r'
+else case e in #(
+  e) lt_cv_ld_reload_flag='-r' ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
 printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
@@ -10911,8 +11005,8 @@ printf %s "checking for BSD-compatible nm... " >&6; }
 if test ${lt_cv_path_NM+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$NM"; then
+else case e in #(
+  e) if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
@@ -10954,7 +11048,8 @@ else
     IFS="$lt_save_ifs"
   done
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
+fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 printf "%s\n" "$lt_cv_path_NM" >&6; }
@@ -10976,8 +11071,8 @@ printf %s "checking how to recognize dependent libraries... " >&6; }
 if test ${lt_cv_deplibs_check_method+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
+else case e in #(
+  e) lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support
@@ -11156,7 +11251,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
@@ -11208,7 +11304,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 11211 "configure"' > conftest.$ac_ext
+  echo '#line 11307 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11305,8 +11401,8 @@ printf %s "checking whether the C compiler needs -belf... " >&6; }
 if test ${lt_cv_cc_needs_belf+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_ext=c
+else case e in #(
+  e) 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'
@@ -11326,8 +11422,9 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   lt_cv_cc_needs_belf=yes
-else $as_nop
-  lt_cv_cc_needs_belf=no
+else case e in #(
+  e) lt_cv_cc_needs_belf=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -11336,7 +11433,8 @@ 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
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
@@ -11378,8 +11476,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DLLTOOL"; then
+else case e in #(
+  e) if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11401,7 +11499,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
@@ -11423,8 +11522,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_DLLTOOL"; then
+else case e in #(
+  e) if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11446,7 +11545,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
@@ -11480,8 +11580,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AS+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AS"; then
+else case e in #(
+  e) if test -n "$AS"; then
   ac_cv_prog_AS="$AS" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11503,7 +11603,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
@@ -11525,8 +11626,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_AS"; then
+else case e in #(
+  e) if test -n "$ac_ct_AS"; then
   ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11548,7 +11649,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
@@ -11582,8 +11684,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$OBJDUMP"; then
+else case e in #(
+  e) if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11605,7 +11707,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
@@ -11627,8 +11730,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_OBJDUMP"; then
+else case e in #(
+  e) if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11650,7 +11753,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
@@ -11683,8 +11787,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_FILE+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$FILE"; then
+else case e in #(
+  e) if test -n "$FILE"; then
   ac_cv_prog_FILE="$FILE" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11706,7 +11810,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 FILE=$ac_cv_prog_FILE
 if test -n "$FILE"; then
@@ -11780,8 +11885,8 @@ if test -z "$CXXCPP"; then
   if test ${ac_cv_prog_CXXCPP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-      # Double quotes because $CXX needs to be expanded
+else case e in #(
+  e)     # Double quotes because $CXX needs to be expanded
     for CXXCPP in "$CXX -E" cpp /lib/cpp
     do
       ac_preproc_ok=false
@@ -11799,9 +11904,10 @@ _ACEOF
 if ac_fn_cxx_try_cpp "$LINENO"
 then :
 
-else $as_nop
-  # Broken: fails on valid input.
-continue
+else case e in #(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -11815,15 +11921,16 @@ if ac_fn_cxx_try_cpp "$LINENO"
 then :
   # Broken: success on invalid input.
 continue
-else $as_nop
-  # Passes both tests.
+else case e in #(
+  e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# 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 :
@@ -11832,7 +11939,8 @@ fi
 
     done
     ac_cv_prog_CXXCPP=$CXXCPP
-
+   ;;
+esac
 fi
   CXXCPP=$ac_cv_prog_CXXCPP
 else
@@ -11855,9 +11963,10 @@ _ACEOF
 if ac_fn_cxx_try_cpp "$LINENO"
 then :
 
-else $as_nop
-  # Broken: fails on valid input.
-continue
+else case e in #(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -11871,24 +11980,26 @@ if ac_fn_cxx_try_cpp "$LINENO"
 then :
   # Broken: success on invalid input.
 continue
-else $as_nop
-  # Passes both tests.
+else case e in #(
+  e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# 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_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 case e in #(
+  e) { { 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 $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 
 ac_ext=cpp
@@ -11914,8 +12025,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_F77+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$F77"; then
+else case e in #(
+  e) if test -n "$F77"; then
   ac_cv_prog_F77="$F77" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11937,7 +12048,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
@@ -11963,8 +12075,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_F77+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_F77"; then
+else case e in #(
+  e) if test -n "$ac_ct_F77"; then
   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11986,7 +12098,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
@@ -12041,7 +12154,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
 done
 rm -f a.out
 
-# If we don't use `.F' as extension, the preprocessor is not run on the
+# If we don't use '.F' as extension, the preprocessor is not run on the
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
@@ -12050,8 +12163,8 @@ printf %s "checking whether the compiler supports GNU Fortran 77... " >&6; }
 if test ${ac_cv_f77_compiler_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat > conftest.$ac_ext <<_ACEOF
+else case e in #(
+  e) cat > conftest.$ac_ext <<_ACEOF
       program main
 #ifndef __GNUC__
        choke me
@@ -12062,12 +12175,14 @@ _ACEOF
 if ac_fn_f77_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else $as_nop
-  ac_compiler_gnu=no
+else case e in #(
+  e) ac_compiler_gnu=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5
 printf "%s\n" "$ac_cv_f77_compiler_gnu" >&6; }
@@ -12082,8 +12197,8 @@ printf %s "checking whether $F77 accepts -g... " >&6; }
 if test ${ac_cv_prog_f77_g+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  FFLAGS=-g
+else case e in #(
+  e) FFLAGS=-g
 cat > conftest.$ac_ext <<_ACEOF
       program main
 
@@ -12092,11 +12207,13 @@ _ACEOF
 if ac_fn_f77_try_compile "$LINENO"
 then :
   ac_cv_prog_f77_g=yes
-else $as_nop
-  ac_cv_prog_f77_g=no
+else case e in #(
+  e) ac_cv_prog_f77_g=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5
 printf "%s\n" "$ac_cv_prog_f77_g" >&6; }
@@ -12136,8 +12253,8 @@ printf %s "checking the maximum length of command line arguments... " >&6; }
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-    i=0
+else case e in #(
+  e)   i=0
   teststring="ABCD"
 
   case $build_os in
@@ -12240,7 +12357,8 @@ else $as_nop
     fi
     ;;
   esac
-
+ ;;
+esac
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
@@ -12261,8 +12379,8 @@ printf %s "checking command to parse $NM output from $compiler object... " >&6;
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 # These are sane defaults that work on at least a few old systems.
 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
@@ -12455,7 +12573,8 @@ EOF
     lt_cv_sys_global_symbol_pipe=
   fi
 done
-
+ ;;
+esac
 fi
 
 if test -z "$lt_cv_sys_global_symbol_pipe"; then
@@ -12474,8 +12593,8 @@ printf %s "checking for objdir... " >&6; }
 if test ${lt_cv_objdir+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -f .libs 2>/dev/null
+else case e in #(
+  e) rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
   lt_cv_objdir=.libs
@@ -12483,7 +12602,8 @@ else
   # MS-DOS does not allow filenames that begin with a dot.
   lt_cv_objdir=_libs
 fi
-rmdir .libs 2>/dev/null
+rmdir .libs 2>/dev/null ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
 printf "%s\n" "$lt_cv_objdir" >&6; }
@@ -12542,8 +12662,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_AR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AR"; then
+else case e in #(
+  e) if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12565,7 +12685,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
@@ -12587,8 +12708,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_AR"; then
+else case e in #(
+  e) if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12610,7 +12731,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
@@ -12644,8 +12766,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$RANLIB"; then
+else case e in #(
+  e) if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12667,7 +12789,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
@@ -12689,8 +12812,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_RANLIB"; then
+else case e in #(
+  e) if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12712,7 +12835,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
@@ -12746,8 +12870,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_STRIP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$STRIP"; then
+else case e in #(
+  e) if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12769,7 +12893,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
@@ -12791,8 +12916,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_STRIP"; then
+else case e in #(
+  e) if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12814,7 +12939,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
@@ -12899,8 +13025,8 @@ printf %s "checking for ${ac_tool_prefix}file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $MAGIC_CMD in
+else case e in #(
+  e) case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
@@ -12943,6 +13069,7 @@ EOF
   IFS="$lt_save_ifs"
   MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
+esac ;;
 esac
 fi
 
@@ -12962,8 +13089,8 @@ printf %s "checking for file... " >&6; }
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $MAGIC_CMD in
+else case e in #(
+  e) case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
@@ -13006,6 +13133,7 @@ EOF
   IFS="$lt_save_ifs"
   MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
+esac ;;
 esac
 fi
 
@@ -13038,8 +13166,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DSYMUTIL"; then
+else case e in #(
+  e) if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13061,7 +13189,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
@@ -13083,8 +13212,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_DSYMUTIL"; then
+else case e in #(
+  e) if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13106,7 +13235,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
@@ -13140,8 +13270,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_NMEDIT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$NMEDIT"; then
+else case e in #(
+  e) if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13163,7 +13293,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
@@ -13185,8 +13316,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_NMEDIT"; then
+else case e in #(
+  e) if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13208,7 +13339,8 @@ done
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
@@ -13240,8 +13372,8 @@ printf %s "checking for -single_module linker flag... " >&6; }
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_apple_cc_single_mod=no
+else case e in #(
+  e) lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
    # By default we will add the -single_module flag. You can override
    # by either setting the environment variable LT_MULTI_MODULE
@@ -13255,7 +13387,8 @@ else $as_nop
      rm -rf libconftest.dylib*
    fi
    rm conftest.c
-      fi
+      fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
@@ -13264,8 +13397,8 @@ printf %s "checking for -exported_symbols_list linker flag... " >&6; }
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ld_exported_symbols_list=no
+else case e in #(
+  e) lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
@@ -13283,13 +13416,15 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   lt_cv_ld_exported_symbols_list=yes
-else $as_nop
-  lt_cv_ld_exported_symbols_list=no
+else case e in #(
+  e) lt_cv_ld_exported_symbols_list=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
    LDFLAGS="$save_LDFLAGS"
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
@@ -13345,8 +13480,9 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 if test ${with_pic+y}
 then :
   withval=$with_pic; pic_mode="$withval"
-else $as_nop
-  pic_mode=default
+else case e in #(
+  e) pic_mode=default ;;
+esac
 fi
 
 test -z "$pic_mode" && pic_mode=default
@@ -13415,8 +13551,8 @@ printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_rtti_exceptions=no
+else case e in #(
+  e) lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
@@ -13429,11 +13565,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13432: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13568: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13436: \$? = $ac_status" >&5
+   echo "$as_me:13572: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13444,7 +13580,8 @@ else $as_nop
      fi
    fi
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
@@ -13706,8 +13843,8 @@ printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6;
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_pic_works=no
+else case e in #(
+  e) lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -13720,11 +13857,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13723: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13860: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13727: \$? = $ac_status" >&5
+   echo "$as_me:13864: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13735,7 +13872,8 @@ else $as_nop
      fi
    fi
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
@@ -13770,8 +13908,8 @@ printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6;
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_static_works=no
+else case e in #(
+  e) lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -13792,7 +13930,8 @@ else $as_nop
    fi
    $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
@@ -13809,8 +13948,8 @@ printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_c_o=no
+else case e in #(
+  e) lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -13826,11 +13965,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13829: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13968: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13833: \$? = $ac_status" >&5
+   echo "$as_me:13972: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13850,7 +13989,8 @@ else $as_nop
    cd ..
    rmdir conftest
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
@@ -15482,16 +15622,18 @@ test "$dynamic_linker" = no && can_build_shared=no
 if test ${lt_cv_sys_lib_search_path_spec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+else case e in #(
+  e) lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ;;
+esac
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test ${lt_cv_sys_lib_dlsearch_path_spec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+else case e in #(
+  e) lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ;;
+esac
 fi
 
 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
@@ -15600,16 +15742,22 @@ printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char dlopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -15621,24 +15769,27 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_dl_dlopen=yes
-else $as_nop
-  ac_cv_lib_dl_dlopen=no
+else case e in #(
+  e) ac_cv_lib_dl_dlopen=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else $as_nop
-
+else case e in #(
+  e)
     lt_cv_dlopen="dyld"
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
-
+     ;;
+esac
 fi
 
    ;;
@@ -15648,22 +15799,28 @@ fi
 if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen="shl_load"
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char shl_load ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load (void);
 int
 main (void)
 {
@@ -15675,39 +15832,47 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_dld_shl_load=yes
-else $as_nop
-  ac_cv_lib_dld_shl_load=no
+else case e in #(
+  e) ac_cv_lib_dld_shl_load=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else $as_nop
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+else case e in #(
+  e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen="dlopen"
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char dlopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -15719,34 +15884,42 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_dl_dlopen=yes
-else $as_nop
-  ac_cv_lib_dl_dlopen=no
+else case e in #(
+  e) ac_cv_lib_dl_dlopen=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char dlopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -15758,34 +15931,42 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_svld_dlopen=yes
-else $as_nop
-  ac_cv_lib_svld_dlopen=no
+else case e in #(
+  e) ac_cv_lib_svld_dlopen=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char dld_link ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link (void);
 int
 main (void)
 {
@@ -15797,12 +15978,14 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_dld_dld_link=yes
-else $as_nop
-  ac_cv_lib_dld_dld_link=no
+else case e in #(
+  e) ac_cv_lib_dld_dld_link=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
@@ -15811,19 +15994,24 @@ then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
-
+	       ;;
+esac
 fi
 
-
+	     ;;
+esac
 fi
 
-
+	   ;;
+esac
 fi
 
-
+	 ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
 
     ;;
@@ -15851,14 +16039,14 @@ printf %s "checking whether a program can dlopen itself... " >&6; }
 if test ${lt_cv_dlopen_self+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  	  if test "$cross_compiling" = yes; then :
+else case e in #(
+  e) 	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15861 "configure"
+#line 16049 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15940,7 +16128,8 @@ EOF
 fi
 rm -fr conftest*
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 printf "%s\n" "$lt_cv_dlopen_self" >&6; }
@@ -15952,14 +16141,14 @@ printf %s "checking whether a statically linked program can dlopen itself... " >
 if test ${lt_cv_dlopen_self_static+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  	  if test "$cross_compiling" = yes; then :
+else case e in #(
+  e) 	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15962 "configure"
+#line 16151 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16041,7 +16230,8 @@ EOF
 fi
 rm -fr conftest*
 
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
 printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
@@ -16777,8 +16967,9 @@ if test "$GXX" = yes; then
 if test ${with_gnu_ld+y}
 then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else $as_nop
-  with_gnu_ld=no
+else case e in #(
+  e) with_gnu_ld=no ;;
+esac
 fi
 
 ac_prog=ld
@@ -16823,8 +17014,8 @@ fi
 if test ${lt_cv_path_LD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$LD"; then
+else case e in #(
+  e) if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     IFS="$lt_save_ifs"
@@ -16847,7 +17038,8 @@ else $as_nop
   IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
+fi ;;
+esac
 fi
 
 LD="$lt_cv_path_LD"
@@ -16864,8 +17056,8 @@ printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
 if test ${lt_cv_prog_gnu_ld+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+else case e in #(
+  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -16873,6 +17065,7 @@ case `$LD -v 2>&1 </dev/null` in
 *)
   lt_cv_prog_gnu_ld=no
   ;;
+esac ;;
 esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
@@ -18297,8 +18490,8 @@ printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >
 if test ${lt_cv_prog_compiler_pic_works_CXX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_pic_works_CXX=no
+else case e in #(
+  e) lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
@@ -18311,11 +18504,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18314: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18507: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18318: \$? = $ac_status" >&5
+   echo "$as_me:18511: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18326,7 +18519,8 @@ else $as_nop
      fi
    fi
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
@@ -18361,8 +18555,8 @@ printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6;
 if test ${lt_cv_prog_compiler_static_works_CXX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_static_works_CXX=no
+else case e in #(
+  e) lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -18383,7 +18577,8 @@ else $as_nop
    fi
    $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
 printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; }
@@ -18400,8 +18595,8 @@ printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o_CXX+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_c_o_CXX=no
+else case e in #(
+  e) lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -18417,11 +18612,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18420: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18615: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18424: \$? = $ac_status" >&5
+   echo "$as_me:18619: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18441,7 +18636,8 @@ else $as_nop
    cd ..
    rmdir conftest
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
@@ -19119,16 +19315,18 @@ test "$dynamic_linker" = no && can_build_shared=no
 if test ${lt_cv_sys_lib_search_path_spec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+else case e in #(
+  e) lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ;;
+esac
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test ${lt_cv_sys_lib_dlsearch_path_spec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+else case e in #(
+  e) lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ;;
+esac
 fi
 
 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
@@ -19989,8 +20187,8 @@ printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >
 if test ${lt_cv_prog_compiler_pic_works_F77+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_pic_works_F77=no
+else case e in #(
+  e) lt_cv_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
@@ -20003,11 +20201,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20006: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20204: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:20010: \$? = $ac_status" >&5
+   echo "$as_me:20208: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -20018,7 +20216,8 @@ else $as_nop
      fi
    fi
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_F77" >&5
 printf "%s\n" "$lt_cv_prog_compiler_pic_works_F77" >&6; }
@@ -20053,8 +20252,8 @@ printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6;
 if test ${lt_cv_prog_compiler_static_works_F77+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_static_works_F77=no
+else case e in #(
+  e) lt_cv_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -20075,7 +20274,8 @@ else $as_nop
    fi
    $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_F77" >&5
 printf "%s\n" "$lt_cv_prog_compiler_static_works_F77" >&6; }
@@ -20092,8 +20292,8 @@ printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o_F77+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_c_o_F77=no
+else case e in #(
+  e) lt_cv_prog_compiler_c_o_F77=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -20109,11 +20309,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20112: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20312: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:20116: \$? = $ac_status" >&5
+   echo "$as_me:20316: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20133,7 +20333,8 @@ else $as_nop
    cd ..
    rmdir conftest
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5
 printf "%s\n" "$lt_cv_prog_compiler_c_o_F77" >&6; }
@@ -21701,16 +21902,18 @@ test "$dynamic_linker" = no && can_build_shared=no
 if test ${lt_cv_sys_lib_search_path_spec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+else case e in #(
+  e) lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ;;
+esac
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test ${lt_cv_sys_lib_dlsearch_path_spec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+else case e in #(
+  e) lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ;;
+esac
 fi
 
 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
@@ -22270,8 +22473,8 @@ printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_rtti_exceptions=no
+else case e in #(
+  e) lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
@@ -22284,11 +22487,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:22287: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22490: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:22291: \$? = $ac_status" >&5
+   echo "$as_me:22494: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -22299,7 +22502,8 @@ else $as_nop
      fi
    fi
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
@@ -22561,8 +22765,8 @@ printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >
 if test ${lt_cv_prog_compiler_pic_works_GCJ+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_pic_works_GCJ=no
+else case e in #(
+  e) lt_cv_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
@@ -22575,11 +22779,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:22578: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22782: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:22582: \$? = $ac_status" >&5
+   echo "$as_me:22786: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -22590,7 +22794,8 @@ else $as_nop
      fi
    fi
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
 printf "%s\n" "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
@@ -22625,8 +22830,8 @@ printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6;
 if test ${lt_cv_prog_compiler_static_works_GCJ+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_static_works_GCJ=no
+else case e in #(
+  e) lt_cv_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -22647,7 +22852,8 @@ else $as_nop
    fi
    $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
 printf "%s\n" "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
@@ -22664,8 +22870,8 @@ printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test ${lt_cv_prog_compiler_c_o_GCJ+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_c_o_GCJ=no
+else case e in #(
+  e) lt_cv_prog_compiler_c_o_GCJ=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -22681,11 +22887,11 @@ else $as_nop
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:22684: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22890: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:22688: \$? = $ac_status" >&5
+   echo "$as_me:22894: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -22705,7 +22911,8 @@ else $as_nop
    cd ..
    rmdir conftest
    $rm conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
 printf "%s\n" "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
@@ -24285,16 +24492,18 @@ test "$dynamic_linker" = no && can_build_shared=no
 if test ${lt_cv_sys_lib_search_path_spec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+else case e in #(
+  e) lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ;;
+esac
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 if test ${lt_cv_sys_lib_dlsearch_path_spec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+else case e in #(
+  e) lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ;;
+esac
 fi
 
 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
@@ -25321,8 +25530,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_DOLT_BASH+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $DOLT_BASH in
+else case e in #(
+  e) case $DOLT_BASH in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_DOLT_BASH="$DOLT_BASH" # Let the user override the test with a path.
   ;;
@@ -25347,6 +25556,7 @@ done
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 DOLT_BASH=$ac_cv_path_DOLT_BASH
@@ -25535,16 +25745,22 @@ printf %s "checking for isnan in -lm... " >&6; }
 if test ${ac_cv_lib_m_isnan+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char isnan ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char isnan (void);
 int
 main (void)
 {
@@ -25556,12 +25772,14 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_m_isnan=yes
-else $as_nop
-  ac_cv_lib_m_isnan=no
+else case e in #(
+  e) ac_cv_lib_m_isnan=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_isnan" >&5
 printf "%s\n" "$ac_cv_lib_m_isnan" >&6; }
@@ -25580,8 +25798,9 @@ fi
 if test ${with_expat+y}
 then :
   withval=$with_expat; with_expat=$withval
-else $as_nop
-  with_expat=no
+else case e in #(
+  e) with_expat=no ;;
+esac
 fi
 
 
@@ -25660,16 +25879,22 @@ printf %s "checking for XML_ParserCreate in -lexpat... " >&6; }
 if test ${ac_cv_lib_expat_XML_ParserCreate+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lexpat  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char XML_ParserCreate ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XML_ParserCreate (void);
 int
 main (void)
 {
@@ -25681,20 +25906,23 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_expat_XML_ParserCreate=yes
-else $as_nop
-  ac_cv_lib_expat_XML_ParserCreate=no
+else case e in #(
+  e) ac_cv_lib_expat_XML_ParserCreate=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
 printf "%s\n" "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
 if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes
 then :
   expat_found=yes
-else $as_nop
-  expat_found=no
+else case e in #(
+  e) expat_found=no ;;
+esac
 fi
 
 
@@ -25709,8 +25937,9 @@ if test "x$ac_cv_header_expat_h" = xyes
 then :
   printf "%s\n" "#define HAVE_EXPAT_H 1" >>confdefs.h
  expat_found=yes
-else $as_nop
-  expat_found=no
+else case e in #(
+  e) expat_found=no ;;
+esac
 fi
 
 done
@@ -25745,8 +25974,8 @@ printf %s "checking for Expat version >= $min_expat_version... " >&6; }
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking test program" >&5
 printf "%s\n" "$as_me: WARNING: cross compiling: not checking test program" >&2;}
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -25810,11 +26039,13 @@ if ac_fn_c_try_run "$LINENO"
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-else $as_nop
-  no_expat=yes
+else case e in #(
+  e) no_expat=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
 
@@ -25861,9 +26092,10 @@ then :
           echo "*** If you have an old version of Expat installed, it is best"
           echo "*** to remove it, although you may also be able to get things"
           echo "*** to work by modifying you value of LD_LIBRARY_PATH."
-else $as_nop
-   echo "*** The test program failed to compile or link. See the file"
-          echo "*** 'config.log' for more information about what happened."
+else case e in #(
+  e)  echo "*** The test program failed to compile or link. See the file"
+          echo "*** 'config.log' for more information about what happened."  ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -25931,8 +26163,9 @@ printf "%s\n" "#define USE_EXPAT 1" >>confdefs.h
 if test ${with_xerces+y}
 then :
   withval=$with_xerces; with_xerces="$withval"
-else $as_nop
-  with_xerces=no
+else case e in #(
+  e) with_xerces=no ;;
+esac
 fi
 
 
@@ -26012,8 +26245,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 if test "x$ac_cv_header_xercesc_util_XercesVersion_hpp" = xyes
 then :
 
-else $as_nop
-  as_fn_error $? "unable to find Xerces-C++ header files" "$LINENO" 5
+else case e in #(
+  e) as_fn_error $? "unable to find Xerces-C++ header files" "$LINENO" 5 ;;
+esac
 fi
 
 
@@ -26057,11 +26291,12 @@ if ac_fn_cxx_try_cpp "$LINENO"
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 printf "%s\n" "OK" >&6; }
-else $as_nop
-   echo "*** Xerces-C++ version 2.6.0 has serious bugs and cannot be"
+else case e in #(
+  e)  echo "*** Xerces-C++ version 2.6.0 has serious bugs and cannot be"
 	echo "*** used by libSBML.  Please use either versions 2.4 - 2.5 or"
 	echo "*** version 2.7.0"
-	as_fn_error $? "unable to use this version of Xerces-C++ library" "$LINENO" 5
+	as_fn_error $? "unable to use this version of Xerces-C++ library" "$LINENO" 5 ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -26086,8 +26321,9 @@ if ac_fn_cxx_try_link "$LINENO"
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-else $as_nop
-  as_fn_error $? "unable to link with the Xerces-C++ XML library." "$LINENO" 5
+else case e in #(
+  e) as_fn_error $? "unable to link with the Xerces-C++ XML library." "$LINENO" 5 ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -26141,8 +26377,9 @@ fi
 if test ${with_libxml+y}
 then :
   withval=$with_libxml; with_libxml="$withval"
-else $as_nop
-  with_libxml=no
+else case e in #(
+  e) with_libxml=no ;;
+esac
 fi
 
 
@@ -26181,8 +26418,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XML2_CONFIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $XML2_CONFIG in
+else case e in #(
+  e) case $XML2_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test with a path.
   ;;
@@ -26208,6 +26445,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_XML2_CONFIG" && ac_cv_path_XML2_CONFIG="no"
   ;;
+esac ;;
 esac
 fi
 XML2_CONFIG=$ac_cv_path_XML2_CONFIG
@@ -26232,8 +26470,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XML2_CONFIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $XML2_CONFIG in
+else case e in #(
+  e) case $XML2_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test with a path.
   ;;
@@ -26259,6 +26497,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_XML2_CONFIG" && ac_cv_path_XML2_CONFIG="no"
   ;;
+esac ;;
 esac
 fi
 XML2_CONFIG=$ac_cv_path_XML2_CONFIG
@@ -26282,8 +26521,8 @@ printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_XML2_CONFIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $XML2_CONFIG in
+else case e in #(
+  e) case $XML2_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test with a path.
   ;;
@@ -26309,6 +26548,7 @@ IFS=$as_save_IFS
 
   test -z "$ac_cv_path_XML2_CONFIG" && ac_cv_path_XML2_CONFIG="no"
   ;;
+esac ;;
 esac
 fi
 XML2_CONFIG=$ac_cv_path_XML2_CONFIG
@@ -26392,8 +26632,8 @@ printf %s "checking for libxml2 - version >= $min_xml_version... " >&6; }
       if test "$cross_compiling" = yes
 then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -26486,11 +26726,13 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
 
-else $as_nop
-  no_xml=yes
+else case e in #(
+  e) no_xml=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
       CPPFLAGS="$ac_save_CPPFLAGS"
@@ -26538,13 +26780,14 @@ then :
           echo "*** If you have an old version of libxml2 installed, it is best"
           echo "*** to remove it, although you may also be able to get things"
           echo "*** to work by modifying you value of LD_LIBRARY_PATH."
-else $as_nop
-   echo "*** The test program failed to compile or link. See the file"
+else case e in #(
+  e)  echo "*** The test program failed to compile or link. See the file"
           echo "*** config.log for the exact error that occured. This"
           echo "*** usually means LIBXML was incorrectly installed or that"
           echo "*** you have moved LIBXML since it was installed. In the"
           echo "*** latter case, you may want to edit the xml2-config"
-          echo "*** script located in $XML2_CONFIG"
+          echo "*** script located in $XML2_CONFIG"  ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -26618,8 +26861,9 @@ printf "%s\n" "#define USE_LIBXML 1" >>confdefs.h
 if test ${with_check+y}
 then :
   withval=$with_check; with_libcheck=$withval
-else $as_nop
-  with_libcheck=no
+else case e in #(
+  e) with_libcheck=no ;;
+esac
 fi
 
 
@@ -26678,8 +26922,9 @@ if test "x$ac_cv_header_check_h" = xyes
 then :
   printf "%s\n" "#define HAVE_CHECK_H 1" >>confdefs.h
  libcheck_found=yes
-else $as_nop
-  libcheck_found=no
+else case e in #(
+  e) libcheck_found=no ;;
+esac
 fi
 
 done
@@ -26690,16 +26935,22 @@ printf %s "checking for srunner_create in -lcheck... " >&6; }
 if test ${ac_cv_lib_check_srunner_create+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcheck  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char srunner_create ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char srunner_create (void);
 int
 main (void)
 {
@@ -26711,20 +26962,23 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_check_srunner_create=yes
-else $as_nop
-  ac_cv_lib_check_srunner_create=no
+else case e in #(
+  e) ac_cv_lib_check_srunner_create=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_check_srunner_create" >&5
 printf "%s\n" "$ac_cv_lib_check_srunner_create" >&6; }
 if test "x$ac_cv_lib_check_srunner_create" = xyes
 then :
   libcheck_found=yes
-else $as_nop
-  libcheck_found=no
+else case e in #(
+  e) libcheck_found=no ;;
+esac
 fi
 
     fi
@@ -26758,8 +27012,8 @@ printf %s "checking for Check version >= $min_check_version... " >&6; }
     if test "$cross_compiling" = yes
 then :
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -26822,11 +27076,13 @@ if ac_fn_c_try_run "$LINENO"
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-else $as_nop
-  no_check=yes
+else case e in #(
+  e) no_check=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
 
@@ -26881,9 +27137,10 @@ then :
           echo "*** If you have an old version of Check installed, it is best"
           echo "*** to remove it, although you may also be able to get things"
           echo "*** to work by modifying you value of LD_LIBRARY_PATH."
-else $as_nop
-   echo "*** The test program failed to compile or link. See the file"
-          echo "*** 'config.log' for more information about what happened."
+else case e in #(
+  e)  echo "*** The test program failed to compile or link. See the file"
+          echo "*** 'config.log' for more information about what happened."  ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -26944,9 +27201,10 @@ printf "%s\n" "#define USE_LIBCHECK 1" >>confdefs.h
 if test ${with_zlib+y}
 then :
   withval=$with_zlib; with_zlib="$withval"
-else $as_nop
-  with_zlib=autodetect
-
+else case e in #(
+  e) with_zlib=autodetect
+   ;;
+esac
 fi
 
 
@@ -26986,16 +27244,22 @@ printf %s "checking for deflate in -lz... " >&6; }
 if test ${ac_cv_lib_z_deflate+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char deflate ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char deflate (void);
 int
 main (void)
 {
@@ -27007,12 +27271,14 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_z_deflate=yes
-else $as_nop
-  ac_cv_lib_z_deflate=no
+else case e in #(
+  e) ac_cv_lib_z_deflate=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
 printf "%s\n" "$ac_cv_lib_z_deflate" >&6; }
@@ -27022,8 +27288,8 @@ then :
 
   LIBS="-lz $LIBS"
 
-else $as_nop
-
+else case e in #(
+  e)
   		  		LDFLAGS="-L/usr/lib${LIBSUFFIX} -L/usr/local/lib${LIBSUFFIX} ${LDFLAGS} ${ZLIB_LDFLAGS}"
   		CPPFLAGS="-I/usr/include -I/usr/local/include ${CPPFLAGS} ${ZLIB_CPPFLAGS}"
                   LIBS="${LIBS} ${ZLIB_LIBS}"
@@ -27032,27 +27298,45 @@ else $as_nop
 
 /* 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.  */
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
 char
 /* 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.  */
-char deflate ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char deflate (void);
 int
 main (void)
 {
 return deflate ();
   ;
   return 0;
-} ();
+} (void);
 int
 main (void)
 {
 return
 /* 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.  */
-char deflate ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char deflate (void);
 int
 main (void)
 {
@@ -27071,8 +27355,8 @@ then :
                     printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h
 
 
-else $as_nop
-
+else case e in #(
+  e)
                    libz_detected=no
                    if test "x$with_zlib" != "xautodetect"; then
                     as_fn_error $? "*** zlib missing - please install zlib first or check config.log.
@@ -27083,12 +27367,14 @@ else $as_nop
 printf "%s\n" "$as_me: WARNING: *** zlib missing." >&2;}
                    fi
 
-
+                ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-
+       ;;
+esac
 fi
 
 
@@ -27096,8 +27382,8 @@ fi
 if test "x$ac_cv_header_zlib_h" = xyes
 then :
   zlib_h_detected=yes
-else $as_nop
-
+else case e in #(
+  e)
                       zlib_h_detected="no"
                       if test "x$with_zlib" != "xautodetect"; then
                         as_fn_error $? "*** zlib.h missing - please install zlib first or check config.log.
@@ -27108,7 +27394,8 @@ else $as_nop
 printf "%s\n" "$as_me: WARNING: *** zlib.h missing." >&2;}
                       fi
 
-
+     ;;
+esac
 fi
 
 
@@ -27131,8 +27418,8 @@ then :
   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking zlib version" >&5
 printf "%s\n" "$as_me: WARNING: cross compiling: not checking zlib version" >&2;}
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #include <stdio.h>
@@ -27164,8 +27451,8 @@ if ac_fn_c_try_run "$LINENO"
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-else $as_nop
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+else case e in #(
+  e)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
         if test -z "$zlib_check_nonfatal"; then
           if test "x$with_zlib" != "xautodetect"; then
@@ -27181,10 +27468,12 @@ See http://www.gzip.org/zlib/ for details." "$LINENO" 5
           { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib version may have security problems" >&5
 printf "%s\n" "$as_me: WARNING: zlib version may have security problems" >&2;}
         fi
-
+        ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
 
@@ -27222,9 +27511,10 @@ printf "%s\n" "no" >&6; }
 if test ${with_bzip2+y}
 then :
   withval=$with_bzip2; with_bzip2="$withval"
-else $as_nop
-  with_bzip2=autodetect
-
+else case e in #(
+  e) with_bzip2=autodetect
+   ;;
+esac
 fi
 
 
@@ -27265,16 +27555,22 @@ printf %s "checking for BZ2_bzopen in -lbz2... " >&6; }
 if test ${ac_cv_lib_bz2_BZ2_bzopen+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbz2  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-char BZ2_bzopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char BZ2_bzopen (void);
 int
 main (void)
 {
@@ -27286,12 +27582,14 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_bz2_BZ2_bzopen=yes
-else $as_nop
-  ac_cv_lib_bz2_BZ2_bzopen=no
+else case e in #(
+  e) ac_cv_lib_bz2_BZ2_bzopen=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzopen" >&5
 printf "%s\n" "$ac_cv_lib_bz2_BZ2_bzopen" >&6; }
@@ -27301,8 +27599,8 @@ then :
 
   LIBS="-lbz2 $LIBS"
 
-else $as_nop
-
+else case e in #(
+  e)
   		  		LDFLAGS="-L/usr/lib${LIBSUFFIX} -L/usr/local/lib${LIBSUFFIX} ${LDFLAGS} ${BZ2_LDFLAGS}"
   		CPPFLAGS="-I/usr/include -I/usr/local/include ${CPPFLAGS} ${BZ2_CPPFLAGS}"
                   LIBS="${LIBS} ${BZ2_LIBS}"
@@ -27311,8 +27609,14 @@ else $as_nop
 
 /* 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.  */
-char BZ2_bzopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char BZ2_bzopen (void);
 int
 main (void)
 {
@@ -27328,8 +27632,8 @@ then :
                     printf "%s\n" "#define HAVE_BZ2 1" >>confdefs.h
 
 
-else $as_nop
-
+else case e in #(
+  e)
                     libbz2_detected=no
                     if test "x$with_bzip2" != "xautodetect"; then
                       as_fn_error $? "*** bzip2 missing - please install bzip2 first or check config.log.
@@ -27340,12 +27644,14 @@ else $as_nop
 printf "%s\n" "$as_me: WARNING: *** bzip2 missing." >&2;}
                     fi
 
-
+  		 ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-
+      ;;
+esac
 fi
 
 
@@ -27353,8 +27659,8 @@ fi
 if test "x$ac_cv_header_bzlib_h" = xyes
 then :
   bzlib_h_detected=yes
-else $as_nop
-
+else case e in #(
+  e)
                       bzlib_h_detected="no"
                       if test "x$with_bzip2" != "xautodetect"; then
                         as_fn_error $? "*** bzlib.h missing - please install bzip2 first or check config.log.
@@ -27365,7 +27671,8 @@ else $as_nop
 printf "%s\n" "$as_me: WARNING: *** bzlib.h missing." >&2;}
                       fi
 
-
+     ;;
+esac
 fi
 
 
@@ -27399,16 +27706,14 @@ printf "%s\n" "no" >&6; }
 
 
 
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change.  They are probably safe to remove.
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+else case e in #(
+  e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
      if test -z "$EGREP"; then
@@ -27430,9 +27735,10 @@ do
       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
+case `"$ac_path_EGREP" --version 2>&1` in #(
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -27468,12 +27774,15 @@ else
   ac_cv_path_EGREP=$EGREP
 fi
 
-   fi
+   fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 printf "%s\n" "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
+         EGREP_TRADITIONAL=$EGREP
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
 
 ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
@@ -27505,8 +27814,8 @@ printf %s "checking whether byte ordering is bigendian... " >&6; }
 if test ${ac_cv_c_bigendian+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_c_bigendian=unknown
+else case e in #(
+  e) ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27552,8 +27861,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 int
 main (void)
 {
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\
 		     && LITTLE_ENDIAN)
 	      bogus endian macros
 	     #endif
@@ -27584,8 +27893,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_bigendian=yes
-else $as_nop
-  ac_cv_c_bigendian=no
+else case e in #(
+  e) ac_cv_c_bigendian=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
@@ -27629,8 +27939,9 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_bigendian=yes
-else $as_nop
-  ac_cv_c_bigendian=no
+else case e in #(
+  e) ac_cv_c_bigendian=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
@@ -27657,22 +27968,23 @@ unsigned short int ascii_mm[] =
 		int use_ebcdic (int i) {
 		  return ebcdic_mm[i] + ebcdic_ii[i];
 		}
-		extern int foo;
-
-int
-main (void)
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
+		int
+		main (int argc, char **argv)
+		{
+		  /* Intimidate the compiler so that it does not
+		     optimize the arrays away.  */
+		  char *p = argv[0];
+		  ascii_mm[1] = *p++; ebcdic_mm[1] = *p++;
+		  ascii_ii[1] = *p++; ebcdic_ii[1] = *p++;
+		  return use_ascii (argc) == use_ebcdic (*p);
+		}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
+if ac_fn_c_try_link "$LINENO"
 then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+  if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	    if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then
 	      if test "$ac_cv_c_bigendian" = unknown; then
 		ac_cv_c_bigendian=no
 	      else
@@ -27681,9 +27993,10 @@ then :
 	      fi
 	    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -27706,14 +28019,17 @@ _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_c_bigendian=no
-else $as_nop
-  ac_cv_c_bigendian=yes
+else case e in #(
+  e) ac_cv_c_bigendian=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-    fi
+    fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
 printf "%s\n" "$ac_cv_c_bigendian" >&6; }
@@ -27738,8 +28054,8 @@ printf %s "checking for an ANSI C-conforming const... " >&6; }
 if test ${ac_cv_c_const+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -27803,10 +28119,12 @@ _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_const=yes
-else $as_nop
-  ac_cv_c_const=no
+else case e in #(
+  e) ac_cv_c_const=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
 printf "%s\n" "$ac_cv_c_const" >&6; }
@@ -27820,10 +28138,11 @@ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 if test "x$ac_cv_type_size_t" = xyes
 then :
 
-else $as_nop
-
+else case e in #(
+  e)
 printf "%s\n" "#define size_t unsigned int" >>confdefs.h
-
+ ;;
+esac
 fi
 
 
@@ -28412,8 +28731,8 @@ cat >confcache <<\_ACEOF
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# 'ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* 'ac_cv_foo' will be assigned the
 # following values.
 
 _ACEOF
@@ -28443,14 +28762,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
+      # 'set' does not quote correctly, so add quotes: double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
@@ -28541,7 +28860,6 @@ 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 :
   emulate sh
@@ -28550,12 +28868,13 @@ then :
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else $as_nop
-  case `(set -o) 2>/dev/null` in #(
+else case e in #(
+  e) case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
+esac ;;
 esac
 fi
 
@@ -28627,7 +28946,7 @@ IFS=$as_save_IFS
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
@@ -28656,7 +28975,6 @@ as_fn_error ()
 } # as_fn_error
 
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -28696,11 +29014,12 @@ then :
   {
     eval $1+=\$2
   }'
-else $as_nop
-  as_fn_append ()
+else case e in #(
+  e) as_fn_append ()
   {
     eval $1=\$$1\$2
-  }
+  } ;;
+esac
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -28714,11 +29033,12 @@ then :
   {
     as_val=$(( $* ))
   }'
-else $as_nop
-  as_fn_arith ()
+else case e in #(
+  e) as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  }
+  } ;;
+esac
 fi # as_fn_arith
 
 
@@ -28801,9 +29121,9 @@ if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -28884,10 +29204,12 @@ as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
@@ -28903,7 +29225,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by libSBML $as_me 5.20.4, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -28934,7 +29256,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
+'$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
 and actions are specified as TAGs, all are instantiated by default.
 
@@ -28968,10 +29290,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 libSBML config.status 5.20.4
-configured by $0, generated by GNU Autoconf 2.71,
+configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2023 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -29031,8 +29353,8 @@ do
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+    as_fn_error $? "ambiguous option: '$1'
+Try '$0 --help' for more information.";;
   --help | --hel | -h )
     printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -29040,8 +29362,8 @@ Try \`$0 --help' for more information.";;
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+  -*) as_fn_error $? "unrecognized option: '$1'
+Try '$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
@@ -29331,7 +29653,7 @@ do
     "macosx/libsbml-package.pmdoc/01local.xml") CONFIG_FILES="$CONFIG_FILES macosx/libsbml-package.pmdoc/01local.xml" ;;
     "macosx/libsbml-package.pmdoc/index.xml") CONFIG_FILES="$CONFIG_FILES macosx/libsbml-package.pmdoc/index.xml" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -29350,7 +29672,7 @@ fi
 # creating and moving files from /tmp can sometimes cause problems.
 # Hook for its removal unless debugging.
 # Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
+# after its creation but before its name has been assigned to '$tmp'.
 $debug ||
 {
   tmp= ac_tmp=
@@ -29374,7 +29696,7 @@ ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+# This happens for instance with './config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
 
@@ -29532,13 +29854,13 @@ fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
 # No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
+# This happens for instance with './config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
 cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
-# Transform confdefs.h into an awk script `defines.awk', embedded as
+# Transform confdefs.h into an awk script 'defines.awk', embedded as
 # here-document in config.status, that substitutes the proper values into
 # config.h.in to produce config.h.
 
@@ -29648,7 +29970,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -29670,19 +29992,19 @@ do
       -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
+	 # because $ac_f cannot contain ':'.
 	 test -f "$ac_f" ||
 	   case $ac_f in
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # Let's still pretend it is 'configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
@@ -29810,7 +30132,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 esac
 _ACEOF
 
-# Neutralize VPATH when `$srcdir' = `.'.
+# Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -29840,9 +30162,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'
+  { printf "%s\n" "$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'
+printf "%s\n" "$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"
diff --git a/configure.ac b/configure.ac
index 156e2f9df0..f9988df954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,15 +38,11 @@ dnl ---------------------------------------------------------------------------
 
 m4_define(LIBSBML_VERSION, m4_esyscmd_s(cat VERSION.txt))
 
-dnl The AC_PREREQ macro can come before AC_INIT (but it's the only one).
+dnl The AC_PREREQ([2.72]) macro can come before AC_INIT (but it's the only one).
 
-AC_PREREQ([2.62])
+AC_PREREQ([2.72])
 
-AC_INIT([libSBML],
-        [LIBSBML_VERSION],
-        [libsbml-team@googlegroups.com],
-        [libsbml],
-        [http://sbml.org/Software/libSBML])
+AC_INIT([libSBML],[LIBSBML_VERSION],[libsbml-team@googlegroups.com],[libsbml],[http://sbml.org/Software/libSBML])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -86,8 +82,7 @@ dnl ---------------------------------------------------------------------------
 dnl [2007-06-25] This is not currently functioning and may never be again.
 
 dnl AC_ARG_ENABLE([memory-tracing],
-dnl   AC_HELP_STRING([--enable-memory-tracing],
-dnl                  [Enable memory tracing (default: disabled)]),
+dnl   AS_HELP_STRING([--enable-memory-tracing],[dnl                  Enable memory tracing (default: disabled)]),
 dnl     [enable_tracing=$withval],
 dnl     [enable_tracing=no])
 
@@ -378,7 +373,9 @@ dnl ---------------------------------------------------------------------------
 dnl Checks for header files.
 dnl ---------------------------------------------------------------------------
 
-AC_HEADER_STDC
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+
 AC_CHECK_HEADERS(errno.h)
 AC_CHECK_HEADERS(math.h)
 AC_CHECK_HEADERS(ieeefp.h)
diff --git a/src/bindings/swig/swigdoc.py b/src/bindings/swig/swigdoc.py
index 6dcf8d624f..df4ad62aaf 100755
--- a/src/bindings/swig/swigdoc.py
+++ b/src/bindings/swig/swigdoc.py
@@ -467,7 +467,7 @@ def __init__ (self, isInternal, docstring, name, args, isConst, isVirtual):
     # this fixes a real problem in the Java documentation for libSBML.
 
     if language == 'java' or language == 'csharp':
-      if isConst and 'unsigned int' in args >= 0:
+      if isConst and 'unsigned int' in args:
         self.args = ''
       elif not args.strip() == '()':
         if isConst:
diff --git a/src/sbml/SBMLDocument.cpp b/src/sbml/SBMLDocument.cpp
index 07d345c70a..0d7aadf11c 100644
--- a/src/sbml/SBMLDocument.cpp
+++ b/src/sbml/SBMLDocument.cpp
@@ -730,6 +730,12 @@ SBMLDocument::checkConsistency ()
 }
 
 
+unsigned int
+SBMLDocument::checkConsistencyWithStrictUnits ()
+{
+  return checkConsistencyWithStrictUnits(LIBSBML_OVERRIDE_ERROR);
+}
+
 /*
  * Performs a set of semantic consistency checks on the document.  Query
  * the results by calling getNumErrors() and getError().
@@ -737,7 +743,7 @@ SBMLDocument::checkConsistency ()
  * @return the number of failed checks (errors) encountered.
  */
 unsigned int
-SBMLDocument::checkConsistencyWithStrictUnits ()
+SBMLDocument::checkConsistencyWithStrictUnits (XMLErrorSeverityOverride_t strictErrorOverride /* = LIBSBML_OVERRIDE_ERROR */)
 {
   // keep a copy of the override status
   // and then override any change
@@ -781,7 +787,7 @@ SBMLDocument::checkConsistencyWithStrictUnits ()
   else
   {
     // log as errors
-    getErrorLog()->setSeverityOverride(LIBSBML_OVERRIDE_ERROR);
+    getErrorLog()->setSeverityOverride(strictErrorOverride);
     StrictUnitConsistencyValidator unit_validator;
     unit_validator.init();
     unsigned int nerrors = unit_validator.validate(*this);
diff --git a/src/sbml/SBMLDocument.h b/src/sbml/SBMLDocument.h
index f94b745317..111581d280 100644
--- a/src/sbml/SBMLDocument.h
+++ b/src/sbml/SBMLDocument.h
@@ -305,7 +305,7 @@
 #include <sbml/SBMLErrorLog.h>
 #include <sbml/SBase.h>
 #include <sbml/SBMLTransforms.h>
-
+#include <sbml/xml/XMLError.h>
 
 #ifdef __cplusplus
 
@@ -318,7 +318,6 @@ LIBSBML_CPP_NAMESPACE_BEGIN
 class Model;
 class ConversionProperties;
 class SBMLVisitor;
-class XMLError;
 
 class SBMLValidator;
 class SBMLInternalValidator;
@@ -341,7 +340,10 @@ class SBMLLevelVersionConverter;
 #define OverdeterCheckOFF 0xdf
 #define PracticeCheckON   0x40
 #define PracticeCheckOFF  0xbf
+#define StrictUnitsCheckON 0x80
+#define StrictUnitsCheckOFF 0x7f
 #define AllChecksON       0x7f
+#define AllChecksONWithStrictUnits 0xff
 /** @endcond */
 
 
@@ -1005,12 +1007,36 @@ class LIBSBML_EXTERN SBMLDocument: public SBase
    * flag in the individual SBMLError objects returned by
    * SBMLDocument::getError(@if java long@endif) to determine the nature of the failures.
    *
+   * @param strictErrorOverride the severity of the error to use for strict units checking
+   *       by default unit validations will be flagged as an error using this method. Use
+   *       LIBSBML_OVERRIDE_WARNING to change this to a warning.
+   * 
    * @return the number of failed checks (errors) encountered.
    *
    * @see SBMLDocument::checkInternalConsistency()
    */
   unsigned int checkConsistencyWithStrictUnits ();
 
+  /**
+   * Performs consistency checking and validation on this SBML document
+   * using the ultra strict units validator that assumes that there
+   * are no hidden numerical conversion factors.
+   *
+   * If this method returns a nonzero value (meaning, one or more
+   * consistency checks have failed for SBML document), the failures may be
+   * due to warnings @em or errors.  Callers should inspect the severity
+   * flag in the individual SBMLError objects returned by
+   * SBMLDocument::getError(@if java long@endif) to determine the nature of the failures.
+   *
+   * @param strictErrorOverride the severity of the error to use for strict units checking
+   *       by default unit validations will be flagged as an error using this method. Use
+   *       LIBSBML_OVERRIDE_WARNING to change this to a warning.
+   * 
+   * @return the number of failed checks (errors) encountered.
+   *
+   * @see SBMLDocument::checkInternalConsistency()
+   */
+  unsigned int checkConsistencyWithStrictUnits (XMLErrorSeverityOverride_t strictErrorOverride);
 
   /**
    * Performs consistency checking and validation on this SBML document.
diff --git a/src/sbml/SBMLError.cpp b/src/sbml/SBMLError.cpp
index ca03ae6c37..6903e8ddc9 100644
--- a/src/sbml/SBMLError.cpp
+++ b/src/sbml/SBMLError.cpp
@@ -171,7 +171,8 @@ static struct sbmlCategoryString {
   { LIBSBML_CAT_MODELING_PRACTICE,      "Modeling practice"           },
   { LIBSBML_CAT_INTERNAL_CONSISTENCY,   "Internal consistency"        },
   { LIBSBML_CAT_SBML_L2V4_COMPAT,	"Translation to SBML L2V4"    },
-  { LIBSBML_CAT_SBML_L3V1_COMPAT, "Translation to SBML L3V1Core" }
+  { LIBSBML_CAT_SBML_L3V1_COMPAT, "Translation to SBML L3V1Core" },
+  { LIBSBML_CAT_STRICT_UNITS_CONSISTENCY, "Strict unit consistency"   }
 };
 
 static unsigned int sbmlCategoryStringTableSize
diff --git a/src/sbml/SBMLError.h b/src/sbml/SBMLError.h
index 3e59e1d37b..3106785c2c 100644
--- a/src/sbml/SBMLError.h
+++ b/src/sbml/SBMLError.h
@@ -1039,6 +1039,9 @@ typedef enum
   , LIBSBML_CAT_SBML_COMPATIBILITY
     /*!< Category of errors that can only occur during attempted
      * translation from one Level/Version of SBML to another. */
+  , LIBSBML_CAT_STRICT_UNITS_CONSISTENCY
+    /*!< Category of errors that occur running the strict unit 
+     * validator. */
 
 } SBMLErrorCategory_t;
 
diff --git a/src/sbml/common/libsbml-version.h b/src/sbml/common/libsbml-version.h
index 285f111d79..fb37cc8dcd 100644
--- a/src/sbml/common/libsbml-version.h
+++ b/src/sbml/common/libsbml-version.h
@@ -62,7 +62,7 @@
  * libSBML is released, making it easy to use less-than and greater-than
  * comparisons when testing versions numbers.
  */
-#define LIBSBML_VERSION		52002
+#define LIBSBML_VERSION		52004
 
 
 /**
@@ -70,7 +70,7 @@
  *
  * The numeric version as a string: version 1.2.3 becomes "10203".
  */
-#define LIBSBML_VERSION_STRING	"52002"
+#define LIBSBML_VERSION_STRING	"52004"
 
 
 LIBSBML_CPP_NAMESPACE_BEGIN
diff --git a/src/sbml/conversion/SBMLRateRuleConverter.cpp b/src/sbml/conversion/SBMLRateRuleConverter.cpp
index b81b6fd783..b3b313717c 100644
--- a/src/sbml/conversion/SBMLRateRuleConverter.cpp
+++ b/src/sbml/conversion/SBMLRateRuleConverter.cpp
@@ -525,6 +525,9 @@ SBMLRateRuleConverter::isPositive(const ASTNode* node, bool& posDeriv)
 {
   bool signDetermined = false;
 
+  if (!node)
+    return signDetermined;
+
   // node will be refactored so should be able to detect sign from first child
   ASTNodeType_t type = node->getType();
 
diff --git a/src/sbml/conversion/test/TestSBMLRateRuleConverter.cpp b/src/sbml/conversion/test/TestSBMLRateRuleConverter.cpp
index f7c6d5bcf9..7e0a33006e 100644
--- a/src/sbml/conversion/test/TestSBMLRateRuleConverter.cpp
+++ b/src/sbml/conversion/test/TestSBMLRateRuleConverter.cpp
@@ -217,6 +217,56 @@ START_TEST(test_conversion_raterule_converter)
 }
 END_TEST
 
+
+START_TEST(test_crash_converter)
+{
+  ConversionProperties props;
+  props.addOption("inferReactions", true);
+
+  SBMLConverter* converter = new SBMLRateRuleConverter();
+  converter->setProperties(&props);
+
+  SBMLDocument* doc = new SBMLDocument(3, 2);
+  Model* model = doc->createModel();
+  model->setId("m");
+
+  Parameter* parameter1 = model->createParameter();
+  parameter1->setId("s");
+  parameter1->setConstant(false);
+  parameter1->setValue(0);
+
+  Parameter* parameter = model->createParameter();
+  parameter->setId("p");
+  parameter->setConstant(false);
+  parameter->setValue(0);
+
+  parameter = model->createParameter();
+  parameter->setId("k");
+  parameter->setConstant(true);
+  parameter->setValue(0);
+
+  RateRule* rr1 = model->createRateRule();
+  rr1->setVariable("s");
+  ASTNode *math = SBML_parseL3Formula("cos(s)");
+  rr1->setMath(math);
+  delete math;
+
+  RateRule* rr2 = model->createRateRule();
+  rr1->setVariable("s");
+  math = SBML_parseL3Formula("sin(s)");
+  rr1->setMath(math);
+  delete math;
+
+  converter->setDocument(doc);
+  fail_unless(converter->convert() == LIBSBML_OPERATION_FAILED);
+
+  delete converter;
+  delete doc;
+}
+END_TEST
+
+
+
 START_TEST(test_conversion_raterule_converter_non_standard_stoichiometry)
 {
 	// example 3.13 in Fages et al, TCS, 2015
@@ -681,6 +731,7 @@ create_suite_TestSBMLRateRuleConverter (void)
   tcase_add_test(tcase, test_conversion_raterule_converter);
   tcase_add_test(tcase, test_conversion_raterule_converter_non_standard_stoichiometry);
   tcase_add_test(tcase, test_conversion_raterule_converter_hidden_variable);
+  tcase_add_test(tcase, test_crash_converter);
   tcase_add_test(tcase, test_model);
   tcase_add_test(tcase, test_model1);
   tcase_add_test(tcase, test_model2);
diff --git a/src/sbml/packages/render/sbml/ListOfGlobalRenderInformation.cpp b/src/sbml/packages/render/sbml/ListOfGlobalRenderInformation.cpp
index 5e7a877ea0..3c8375f0a9 100644
--- a/src/sbml/packages/render/sbml/ListOfGlobalRenderInformation.cpp
+++ b/src/sbml/packages/render/sbml/ListOfGlobalRenderInformation.cpp
@@ -789,6 +789,8 @@ ListOfGlobalRenderInformation::getAllElements(ElementFilter* filter)
 {
   List* ret = new List();
   List* sublist = ListOf::getAllElements(filter);
+  ret->transferFrom(sublist);
+  delete sublist;
 
   ADD_FILTERED_POINTER(ret, sublist, mDefaultValues, filter);
 
diff --git a/src/sbml/packages/render/sbml/ListOfLocalRenderInformation.cpp b/src/sbml/packages/render/sbml/ListOfLocalRenderInformation.cpp
index 07e18eda21..32f73f3cca 100644
--- a/src/sbml/packages/render/sbml/ListOfLocalRenderInformation.cpp
+++ b/src/sbml/packages/render/sbml/ListOfLocalRenderInformation.cpp
@@ -760,6 +760,8 @@ ListOfLocalRenderInformation::getAllElements(ElementFilter* filter)
 {
   List* ret = new List();
   List* sublist = ListOf::getAllElements(filter);
+  ret->transferFrom(sublist);
+  delete sublist;
 
   ADD_FILTERED_POINTER(ret, sublist, mDefaultValues, filter);
 
diff --git a/src/sbml/packages/render/sbml/Style.cpp b/src/sbml/packages/render/sbml/Style.cpp
index e126f28905..84db2c7344 100644
--- a/src/sbml/packages/render/sbml/Style.cpp
+++ b/src/sbml/packages/render/sbml/Style.cpp
@@ -601,6 +601,7 @@ Style::createGroup()
 
   delete renderns;
   this->setGroup(g);
+  delete g;
 
   connectToChild();
 
@@ -1280,6 +1281,7 @@ Style::createObject(XMLInputStream& stream)
     RenderGroup* g = new RenderGroup(renderns);
     g->setElementName(name);
     setGroup(g);
+    delete g;
     obj = &mGroup;
   }
 
diff --git a/src/sbml/packages/render/sbml/Transformation2D.cpp b/src/sbml/packages/render/sbml/Transformation2D.cpp
index fc03e34cab..a58776d794 100644
--- a/src/sbml/packages/render/sbml/Transformation2D.cpp
+++ b/src/sbml/packages/render/sbml/Transformation2D.cpp
@@ -714,65 +714,72 @@ Transformation2D::addExpectedAttributes(ExpectedAttributes& attributes)
  */
 void
 Transformation2D::readAttributes(const XMLAttributes& attributes,
-                                 const ExpectedAttributes& expectedAttributes)
-{
-  unsigned int level = getLevel();
-  unsigned int version = getVersion();
-  unsigned int pkgVersion = getPackageVersion();
-  unsigned int numErrs;
-  SBMLErrorLog* log = getErrorLog();
-
-  if (log && getParentSBMLObject() &&
-    static_cast<ListOfDrawables*>(getParentSBMLObject())->size() < 2)
-  {
-    numErrs = log->getNumErrors();
-    for (int n = numErrs-1; n >= 0; n--)
-    {
-      if (log->getError(n)->getErrorId() == UnknownPackageAttribute)
-      {
-        const std::string details = log->getError(n)->getMessage();
-        log->remove(UnknownPackageAttribute);
-        log->logPackageError("render", RenderUnknown, pkgVersion, level,
-          version, details, getLine(), getColumn());
-      }
-      else if (log->getError(n)->getErrorId() == UnknownCoreAttribute)
-      {
-        const std::string details = log->getError(n)->getMessage();
-        log->remove(UnknownCoreAttribute);
-        log->logPackageError("render", RenderUnknown, pkgVersion, level,
-          version, details, getLine(), getColumn());
-      }
+    const ExpectedAttributes& expectedAttributes)
+{
+    unsigned int level = getLevel();
+    unsigned int version = getVersion();
+    unsigned int pkgVersion = getPackageVersion();
+    unsigned int numErrs;
+    SBMLErrorLog* log = getErrorLog();
+
+    if (log && getParentSBMLObject()) {
+        bool isSizeOne = false;
+        int type = getParentSBMLObject()->getTypeCode();
+        switch (type) {
+        case SBML_LIST_OF:
+            if (static_cast<ListOf*>(getParentSBMLObject())->size() < 2)
+            {
+                isSizeOne = true;
+            }
+            break;
+        case SBML_RENDER_LINEENDING:
+        case SBML_RENDER_STYLE_BASE:
+        case SBML_RENDER_LOCALSTYLE:
+        case SBML_RENDER_GLOBALSTYLE:
+            // These objects all have a single RenderGroup child, so the size can never be greater than 2.
+            isSizeOne = true;
+            break;
+        case SBML_RENDER_GROUP:
+        {
+            //A RenderGroup can have multiple Transformation2D children.
+            RenderGroup* rg = static_cast<RenderGroup*>(getParentSBMLObject());
+            if (rg->getNumElements() < 2)
+            {
+                isSizeOne = false;
+            }
+            break;
+        }
+        default:
+            assert(false); //Some situation we didn't think through; could be anything.
+            isSizeOne = true;
+        }
+        if (isSizeOne) {
+            numErrs = log->getNumErrors();
+            for (int n = numErrs - 1; n >= 0; n--)
+            {
+                if (log->getError(n)->getErrorId() == UnknownPackageAttribute)
+                {
+                    const std::string details = log->getError(n)->getMessage();
+                    log->remove(UnknownPackageAttribute);
+                    log->logPackageError("render", RenderUnknown, pkgVersion, level,
+                        version, details, getLine(), getColumn());
+                }
+                else if (log->getError(n)->getErrorId() == UnknownCoreAttribute)
+                {
+                    const std::string details = log->getError(n)->getMessage();
+                    log->remove(UnknownCoreAttribute);
+                    log->logPackageError("render", RenderUnknown, pkgVersion, level,
+                        version, details, getLine(), getColumn());
+                }
+            }
+        }
     }
-  }
 
-  Transformation::readAttributes(attributes, expectedAttributes);
-
-  //if (log)
-  //{
-  //  numErrs = log->getNumErrors();
-
-  //  for (int n = numErrs-1; n >= 0; n--)
-  //  {
-  //    if (log->getError(n)->getErrorId() == UnknownPackageAttribute)
-  //    {
-  //      const std::string details = log->getError(n)->getMessage();
-  //      log->remove(UnknownPackageAttribute);
-  //      log->logPackageError("render", RenderUnknown, pkgVersion, level,
-  //        version, details);
-  //    }
-  //    else if (log->getError(n)->getErrorId() == UnknownCoreAttribute)
-  //    {
-  //      const std::string details = log->getError(n)->getMessage();
-  //      log->remove(UnknownCoreAttribute);
-  //      log->logPackageError("render",
-  //        RenderTransformation2DAllowedCoreAttributes, pkgVersion, level,
-  //          version, details);
-  //    }
-  //  }
-  //}
+    Transformation::readAttributes(attributes, expectedAttributes);
+
     std::string s;
     attributes.readInto("transform", s);
-    if(!s.empty())
+    if (!s.empty())
     {
         this->parseTransformation(s);
     }
diff --git a/src/sbml/test/TestConsistencyChecks.cpp b/src/sbml/test/TestConsistencyChecks.cpp
index 26a8c24a7d..55671d3b9c 100644
--- a/src/sbml/test/TestConsistencyChecks.cpp
+++ b/src/sbml/test/TestConsistencyChecks.cpp
@@ -150,10 +150,55 @@ START_TEST (test_strict_unit_consistency_checks)
   fail_unless(d->getError(0)->getErrorId() == 10513);
   fail_unless(d->getError(0)->getSeverity() == LIBSBML_SEV_ERROR);
 
+  d->getErrorLog()->clearLog();
+
+  // now once more as warning
+  errors = d->checkConsistencyWithStrictUnits(LIBSBML_OVERRIDE_WARNING);
+
+  fail_unless(errors == 1);
+  fail_unless(d->getError(0)->getErrorId() == 10513);
+  fail_unless(d->getError(0)->getSeverity() == LIBSBML_SEV_WARNING);
+
+
+
   delete d;
 }
 END_TEST
 
+START_TEST (test_check_consistency_settings)
+{
+  SBMLReader        reader;
+  SBMLDocument*     d;
+  unsigned int errors;
+  std::string filename(TestDataDirectory);
+  filename += "l3v1-units.xml";
+
+
+  d = reader.readSBML(filename);
+
+  if (d == NULL)
+  {
+    fail("readSBML(\"l3v1-units.xml\") returned a NULL pointer.");
+  }
+
+  errors = d->checkConsistency();
+
+  fail_unless(errors == 0);
+
+  d->getErrorLog()->clearLog();
+
+  // now enable the strict units check
+  d->setConsistencyChecks(LIBSBML_CAT_STRICT_UNITS_CONSISTENCY, true);
+
+  errors = d->checkConsistency();
+
+  fail_unless(errors == 1);
+  fail_unless(d->getError(0)->getErrorId() == 10513);
+  fail_unless(d->getError(0)->getSeverity() == LIBSBML_SEV_WARNING);
+
+  delete d;
+}
+END_TEST
 
 Suite *
 create_suite_TestConsistencyChecks (void)
@@ -164,6 +209,7 @@ create_suite_TestConsistencyChecks (void)
 
   tcase_add_test(tcase, test_consistency_checks);
   tcase_add_test(tcase, test_strict_unit_consistency_checks);
+  tcase_add_test(tcase, test_check_consistency_settings);
 
   suite_add_tcase(suite, tcase);
 
diff --git a/src/sbml/validator/SBMLInternalValidator.cpp b/src/sbml/validator/SBMLInternalValidator.cpp
index b3aee0d39e..e871ea27f2 100644
--- a/src/sbml/validator/SBMLInternalValidator.cpp
+++ b/src/sbml/validator/SBMLInternalValidator.cpp
@@ -54,6 +54,7 @@
 #include <sbml/validator/MathMLConsistencyValidator.h>
 #include <sbml/validator/SBOConsistencyValidator.h>
 #include <sbml/validator/UnitConsistencyValidator.h>
+#include <sbml/validator/StrictUnitConsistencyValidator.h>
 #include <sbml/validator/OverdeterminedValidator.h>
 #include <sbml/validator/ModelingPracticeValidator.h>
 #include <sbml/validator/L1CompatibilityValidator.h>
@@ -176,6 +177,18 @@ SBMLInternalValidator::setConsistencyChecks(SBMLErrorCategory_t category,
 
     break;
   
+  case LIBSBML_CAT_STRICT_UNITS_CONSISTENCY:
+    if (apply)
+    {
+      mApplicableValidators |= StrictUnitsCheckON;
+    }
+    else
+    {
+      mApplicableValidators &= StrictUnitsCheckOFF;
+    }
+
+    break;
+
   case LIBSBML_CAT_OVERDETERMINED_MODEL:
     if (apply)
     {
@@ -274,6 +287,18 @@ SBMLInternalValidator::setConsistencyChecksForConversion(SBMLErrorCategory_t cat
 
     break;
   
+  case LIBSBML_CAT_STRICT_UNITS_CONSISTENCY:
+    if (apply)
+    {
+      mApplicableValidatorsForConversion |= StrictUnitsCheckON;
+    }
+    else
+    {
+      mApplicableValidatorsForConversion &= StrictUnitsCheckOFF;
+    }
+
+    break;
+
   case LIBSBML_CAT_OVERDETERMINED_MODEL:
     if (apply)
     {
@@ -329,6 +354,7 @@ SBMLInternalValidator::checkConsistency (bool writeDocument)
   bool units = ((mApplicableValidators & 0x10) == 0x10);
   bool over  = ((mApplicableValidators & 0x20) == 0x20);
   bool practice = ((mApplicableValidators & 0x40) == 0x40);
+  bool strictUnits = ((mApplicableValidators & 0x80) == 0x80);
 
   /* taken the state machine concept out for now
   if (LibSBMLStateMachine::isActive()) 
@@ -505,6 +531,25 @@ SBMLInternalValidator::checkConsistency (bool writeDocument)
     }
   }
 
+  if (strictUnits)
+  {
+    StrictUnitConsistencyValidator unit_validator;
+    unit_validator.init();
+    nerrors = unit_validator.validate(*doc);
+    total_errors += nerrors;
+    if (nerrors > 0) 
+    {
+      log->add( unit_validator.getFailures() );
+      /* only want to bail if errors not warnings */
+      if (log->getNumFailsWithSeverity(LIBSBML_SEV_ERROR) > 0)
+      {
+        if (writeDocument)
+          SBMLDocument_free(doc);
+        return total_errors;
+      }
+    }
+  }
+
   /* do not even try if there have been unit warnings 
    * changed this as would have bailed */
   if (over)
diff --git a/src/sbml/validator/Validator.cpp b/src/sbml/validator/Validator.cpp
index 8fbc809bc5..6bfc230e38 100644
--- a/src/sbml/validator/Validator.cpp
+++ b/src/sbml/validator/Validator.cpp
@@ -864,7 +864,8 @@ Validator::validate (const SBMLDocument& d)
 
   if (m != NULL)
   {
-    if (this->getCategory() == LIBSBML_CAT_UNITS_CONSISTENCY)
+    if (this->getCategory() == LIBSBML_CAT_UNITS_CONSISTENCY ||
+        this->getCategory() == LIBSBML_CAT_STRICT_UNITS_CONSISTENCY)
     {
       /* create list of formula units for validation */
       if (!m->isPopulatedListFormulaUnitsData())
diff --git a/src/sbml/xml/XMLAttributes.cpp b/src/sbml/xml/XMLAttributes.cpp
index 067586f19b..ebf934d298 100644
--- a/src/sbml/xml/XMLAttributes.cpp
+++ b/src/sbml/xml/XMLAttributes.cpp
@@ -1448,6 +1448,13 @@ XMLAttributes_getPrefix (const XMLAttributes_t *xa, int index)
   return xa->getPrefix(index).empty() ? NULL : safe_strdup(xa->getPrefix(index).c_str());
 }
 
+LIBLAX_EXTERN
+int
+XMLAttributes_hasPrefix (const XMLAttributes_t *xa, int index)
+{
+  if (xa == NULL) return 0;
+  return xa->getPrefix(index).empty() ? 0 : 1;
+}
 
 LIBLAX_EXTERN
 char *
diff --git a/src/sbml/xml/XMLAttributes.h b/src/sbml/xml/XMLAttributes.h
index 7a434e4ca6..79088a313d 100644
--- a/src/sbml/xml/XMLAttributes.h
+++ b/src/sbml/xml/XMLAttributes.h
@@ -2165,6 +2165,25 @@ LIBLAX_EXTERN
 char *
 XMLAttributes_getPrefix (const XMLAttributes_t *xa, int index);
 
+/**
+ * Return whether an attribute in this XMLAttributes_t structure (by position) has a prefix.
+ *
+ * @param xa the XMLAttributes_t structure.
+ * @param index an integer, the position of the attribute whose value is
+ * required.
+ *
+ * @return 1 if the attribute has a prefix, 0 otherwise.
+ *
+ * @note If index
+ * is out of range, 0 will be returned.
+ * Use XMLAttributes_hasAttribute() != 0 to test for attribute existence.
+ *
+ * @memberof XMLAttributes_t
+ */
+LIBLAX_EXTERN
+int
+XMLAttributes_hasPrefix (const XMLAttributes_t *xa, int index);
+
 
 /**
  * Return the namespace URI of an attribute in this XMLAttributes_t structure (by position).
diff --git a/src/sbml/xml/XMLNode.cpp b/src/sbml/xml/XMLNode.cpp
index 9d0b95e1ea..828ad4bfe8 100644
--- a/src/sbml/xml/XMLNode.cpp
+++ b/src/sbml/xml/XMLNode.cpp
@@ -874,6 +874,13 @@ XMLNode_getPrefix (const XMLNode_t *node)
   return node->getPrefix().empty() ? NULL : node->getPrefix().c_str();
 }
 
+LIBLAX_EXTERN
+int
+XMLNode_hasPrefix (const XMLNode_t *node)
+{
+  if (node == NULL) return 0;
+  return node->getPrefix().empty() ? 0 : 1;
+}
 
 LIBLAX_EXTERN
 const char *
diff --git a/src/sbml/xml/XMLNode.h b/src/sbml/xml/XMLNode.h
index 92ae443f5a..b190a31744 100644
--- a/src/sbml/xml/XMLNode.h
+++ b/src/sbml/xml/XMLNode.h
@@ -833,8 +833,7 @@ XMLNode_getName (const XMLNode_t *node);
  *
  * @return the namespace prefix of this XML element.
  *
- * @note If no prefix
- * exists, an empty string will be return.
+ * @note If no prefix exists, NULL will be returned.
  *
  * @memberof XMLNode_t
  */
@@ -842,6 +841,19 @@ LIBLAX_EXTERN
 const char *
 XMLNode_getPrefix (const XMLNode_t *node);
 
+/**
+ * Returns a flag, whether this XML element has a namespace prefix.
+ *
+ * @param node XMLNode_t structure to be queried.
+ *
+ * @return 1 (true) if this XML element has a namespace prefix, 
+ *         0 (false) otherwise.
+ *
+ * @memberof XMLNode_t
+ */
+LIBLAX_EXTERN
+int
+XMLNode_hasPrefix (const XMLNode_t *node);
 
 /**
  * Returns the namespace URI of this XML element.
diff --git a/src/sbml/xml/test/TestXMLNode.cpp b/src/sbml/xml/test/TestXMLNode.cpp
index e861c4d599..595edc758c 100644
--- a/src/sbml/xml/test/TestXMLNode.cpp
+++ b/src/sbml/xml/test/TestXMLNode.cpp
@@ -180,6 +180,7 @@ START_TEST (test_XMLNode_createFromToken)
 
   fail_unless(strcmp(XMLNode_getName(node), "attr") == 0);
   fail_unless(strcmp(XMLNode_getPrefix(node), "prefix") == 0);
+  fail_unless(XMLNode_hasPrefix(node) == 1);
   fail_unless(strcmp(XMLNode_getURI(node), "uri") == 0);
   fail_unless (XMLNode_getChild(node, 1) != NULL);
 
@@ -220,6 +221,7 @@ START_TEST (test_XMLNode_createElement)
   fail_unless(XMLNode_getNumChildren(snode) == 0);
   fail_unless(strcmp(XMLNode_getName  (snode), name  ) == 0);
   fail_unless(strcmp(XMLNode_getPrefix(snode), prefix) == 0);
+  fail_unless(XMLNode_hasPrefix(snode) == 1);
   fail_unless(strcmp(XMLNode_getURI   (snode), uri   ) == 0);
   fail_unless(XMLNode_isElement(snode) == 1);
   fail_unless(XMLNode_isStart  (snode) == 1);
@@ -266,6 +268,7 @@ START_TEST (test_XMLNode_createElement)
   fail_unless(XMLNode_getNumChildren(snode) == 0);
   fail_unless(strcmp(XMLNode_getName  (snode), "test") == 0);
   fail_unless(XMLNode_getPrefix(snode) == NULL );
+  fail_unless(XMLNode_hasPrefix(snode) == 0 );
   fail_unless(XMLNode_getURI   (snode) == NULL );
   fail_unless(XMLNode_isElement(snode) == 1);
   fail_unless(XMLNode_isStart  (snode) == 1);
@@ -284,6 +287,7 @@ START_TEST (test_XMLNode_createElement)
   free(test);
 
   fail_unless(XMLAttributes_getPrefix(cattr, 0) == NULL);
+  fail_unless(XMLAttributes_hasPrefix(cattr, 0) == 0);
   fail_unless(XMLAttributes_getURI   (cattr, 0) == NULL);
 
   /* end element */
@@ -293,6 +297,7 @@ START_TEST (test_XMLNode_createElement)
   fail_unless(XMLNode_getNumChildren(enode) == 0);
   fail_unless(strcmp(XMLNode_getName(enode), "test") == 0);
   fail_unless(XMLNode_getPrefix(enode) == NULL );
+  fail_unless(XMLNode_hasPrefix(enode) == 0 );
   fail_unless(XMLNode_getURI   (enode) == NULL );
   fail_unless(XMLNode_isElement(enode) == 1);
   fail_unless(XMLNode_isStart  (enode) == 0);