texlive[70552] trunk: configure update from john

commits+karl at tug.org commits+karl at tug.org
Sun Mar 10 18:59:37 CET 2024


Revision: 70552
          https://tug.org/svn/texlive?view=revision&revision=70552
Author:   karl
Date:     2024-03-10 18:59:37 +0100 (Sun, 10 Mar 2024)
Log Message:
-----------
configure update from john

Modified Paths:
--------------
    trunk/Build/source/utils/asymptote/configure
    trunk/Build/source/utils/asymptote/configure.ac
    trunk/Master/tlpkg/bin/tl-update-asy

Modified: trunk/Build/source/utils/asymptote/configure
===================================================================
--- trunk/Build/source/utils/asymptote/configure	2024-03-10 17:07:26 UTC (rev 70551)
+++ trunk/Build/source/utils/asymptote/configure	2024-03-10 17:59:37 UTC (rev 70552)
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for Asymptote 2.88.
+# Generated by GNU Autoconf 2.71 for Asymptote 2.88.
 #
 # Report bugs to <https://github.com/vectorgraphics/asymptote/issues>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
 # Inc.
 #
 #
@@ -17,6 +17,7 @@
 
 # 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
@@ -25,13 +26,12 @@
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else case e in #(
-  e) case `(set -o) 2>/dev/null` in #(
+else $as_nop
+  case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
-esac ;;
 esac
 fi
 
@@ -103,7 +103,7 @@
 
      ;;
 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
@@ -133,7 +133,7 @@
 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
@@ -140,7 +140,8 @@
   # 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="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
 then :
   emulate sh
   NULLCMD=:
@@ -148,13 +149,12 @@
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else case e in #(
-  e) case \`(set -o) 2>/dev/null\` in #(
+else \$as_nop
+  case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
-esac ;;
 esac
 fi
 "
@@ -172,9 +172,8 @@
 if ( set x; as_fn_ret_success y && test x = \"\$1\" )
 then :
 
-else case e in #(
-  e) exitcode=1; echo positional parameters were not saved. ;;
-esac
+else \$as_nop
+  exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
 blah=\$(echo \$(echo blah))
@@ -187,15 +186,14 @@
   if (eval "$as_required") 2>/dev/null
 then :
   as_have_required=yes
-else case e in #(
-  e) as_have_required=no ;;
-esac
+else $as_nop
+  as_have_required=no
 fi
   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
 then :
 
-else case e in #(
-  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else $as_nop
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
@@ -228,14 +226,13 @@
 if $as_found
 then :
 
-else case e in #(
-  e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
 	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
 then :
   CONFIG_SHELL=$SHELL as_have_required=yes
-fi ;;
-esac
 fi
+fi
 
 
       if test "x$CONFIG_SHELL" != x
@@ -256,7 +253,7 @@
 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
@@ -277,10 +274,9 @@
 $0: have one."
   fi
   exit 1
-fi ;;
-esac
 fi
 fi
+fi
 SHELL=${CONFIG_SHELL-/bin/sh}
 export SHELL
 # Unset more variables known to interfere with behavior of common tools.
@@ -317,6 +313,14 @@
   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
 # -------------
@@ -385,12 +389,11 @@
   {
     eval $1+=\$2
   }'
-else case e in #(
-  e) as_fn_append ()
+else $as_nop
+  as_fn_append ()
   {
     eval $1=\$$1\$2
-  } ;;
-esac
+  }
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -404,14 +407,21 @@
   {
     as_val=$(( $* ))
   }'
-else case e in #(
-  e) as_fn_arith ()
+else $as_nop
+  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]
 # ----------------------------------------
@@ -485,8 +495,6 @@
     /[$]LINENO/=
   ' <$as_myself |
     sed '
-      t clear
-      :clear
       s/[$]LINENO.*/&-/
       t lineno
       b
@@ -535,6 +543,7 @@
 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
@@ -546,9 +555,9 @@
   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
@@ -573,12 +582,10 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-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
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
@@ -752,7 +759,6 @@
 enable_static
 enable_fftw
 enable_eigen
-enable_xdr
 enable_gsl
 enable_gl
 enable_offscreen
@@ -879,7 +885,7 @@
     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
@@ -905,7 +911,7 @@
     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
@@ -1118,7 +1124,7 @@
     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
@@ -1134,7 +1140,7 @@
     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
@@ -1164,8 +1170,8 @@
   | --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"
     ;;
 
   *=*)
@@ -1173,7 +1179,7 @@
     # 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 ;;
@@ -1223,7 +1229,7 @@
   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
@@ -1291,7 +1297,7 @@
   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)`
@@ -1319,7 +1325,7 @@
   # 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 Asymptote 2.88 to adapt to many kinds of systems.
+\`configure' configures Asymptote 2.88 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1333,11 +1339,11 @@
       --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
@@ -1345,10 +1351,10 @@
   --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.
 
@@ -1407,7 +1413,6 @@
   --enable-static[=no]    link against static libraries
   --enable-fftw[=yes]     enable FFTW Library
   --enable-eigen[=yes]    enable Eigen Library
-  --enable-xdr[=yes]      enable XDR/V3D support
   --enable-gsl[=yes]      enable GNU Scientific Library
   --enable-gl[=yes]       enable OpenGL Library
   --enable-offscreen[=no] use OSMesa library to implement offscreen rendering
@@ -1434,7 +1439,7 @@
   BISON       bison command
   FLEX        flex command
 
-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 <https://github.com/vectorgraphics/asymptote/issues>.
@@ -1502,9 +1507,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 Asymptote configure 2.88
-generated by GNU Autoconf 2.72
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1543,12 +1548,11 @@
        } && test -s conftest.$ac_objext
 then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1 ;;
-esac
+	ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -1555,54 +1559,6 @@
 
 } # ac_fn_c_try_compile
 
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }
-then :
-  ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	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
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
@@ -1633,13 +1589,12 @@
   test $ac_status = 0; }; }
 then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+else $as_nop
+  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 ;;
-esac
+       ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
@@ -1659,8 +1614,8 @@
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
@@ -1668,12 +1623,10 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$3=yes"
-else case e in #(
-  e) eval "$3=no" ;;
-esac
+else $as_nop
+  eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -1710,12 +1663,11 @@
        } && test -s conftest.$ac_objext
 then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1 ;;
-esac
+	ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -1753,12 +1705,11 @@
        }
 then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1 ;;
-esac
+	ac_retval=1
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -1782,8 +1733,8 @@
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
@@ -1791,12 +1742,10 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   eval "$3=yes"
-else case e in #(
-  e) eval "$3=no" ;;
-esac
+else $as_nop
+  eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -1816,8 +1765,8 @@
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  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.  */
@@ -1824,7 +1773,7 @@
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-   which can conflict with char $2 (void); below.  */
+   which can conflict with char $2 (); below.  */
 
 #include <limits.h>
 #undef $2
@@ -1835,7 +1784,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $2 (void);
+char $2 ();
 /* 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.  */
@@ -1854,13 +1803,11 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   eval "$3=yes"
-else case e in #(
-  e) eval "$3=no" ;;
-esac
+else $as_nop
+  eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+    conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -1869,6 +1816,53 @@
 
 } # ac_fn_cxx_check_func
 
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
 # ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES
 # ---------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -1881,8 +1875,8 @@
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) eval "$3=no"
+else $as_nop
+  eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
@@ -1912,14 +1906,12 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
 
-else case e in #(
-  e) eval "$3=yes" ;;
-esac
+else $as_nop
+  eval "$3=yes"
 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 ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -1958,13 +1950,12 @@
   test $ac_status = 0; }; }
 then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+else $as_nop
+  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 ;;
-esac
+       ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
@@ -1996,7 +1987,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by Asymptote $as_me 2.88, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -2242,10 +2233,10 @@
 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
 
@@ -2281,7 +2272,9 @@
 /* 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 (char **p, int i)
+static char *e (p, i)
+     char **p;
+     int i;
 {
   return p[i];
 }
@@ -2295,21 +2288,6 @@
   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
@@ -2337,19 +2315,16 @@
 
 # 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
@@ -2399,6 +2374,7 @@
 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)
@@ -2464,8 +2440,6 @@
   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 = {
@@ -2487,7 +2461,7 @@
 
 # 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
@@ -2898,9 +2872,8 @@
 if $as_found
 then :
 
-else case e in #(
-  e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
-esac
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
 fi
 
 
@@ -2928,12 +2901,12 @@
   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=: ;;
     ,);;
     *)
@@ -2942,18 +2915,18 @@
 	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.
@@ -2969,11 +2942,11 @@
   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
 ## -------------------- ##
@@ -3120,8 +3093,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3143,9 +3116,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -3166,8 +3138,8 @@
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CC"; then
+else $as_nop
+  if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3189,9 +3161,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
@@ -3225,8 +3196,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3248,9 +3219,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -3271,8 +3241,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
@@ -3311,9 +3281,8 @@
     ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -3336,8 +3305,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3359,9 +3328,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -3386,8 +3354,8 @@
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CC"; then
+else $as_nop
+  if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3409,9 +3377,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
@@ -3448,8 +3415,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3471,9 +3438,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -3494,8 +3460,8 @@
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CC"; then
+else $as_nop
+  if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3517,9 +3483,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
@@ -3547,10 +3512,10 @@
 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
@@ -3622,8 +3587,8 @@
   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.
@@ -3643,7 +3608,7 @@
 	   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.
@@ -3654,9 +3619,8 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else case e in #(
-  e) ac_file='' ;;
-esac
+else $as_nop
+  ac_file=''
 fi
 if test -z "$ac_file"
 then :
@@ -3665,14 +3629,13 @@
 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 case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
@@ -3696,10 +3659,10 @@
   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
@@ -3709,12 +3672,11 @@
     * ) break;;
   esac
 done
-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;}
+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;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3730,8 +3692,6 @@
 main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
- if (!f)
-  return 1;
  return ferror (f) || fclose (f) != 0;
 
   ;
@@ -3771,11 +3731,11 @@
     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
@@ -3782,8 +3742,7 @@
 { 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.o conftest.obj conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
@@ -3790,8 +3749,8 @@
 if test ${ac_cv_objext+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3823,18 +3782,16 @@
        break;;
   esac
 done
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else $as_nop
+  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; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
-esac
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 printf "%s\n" "$ac_cv_objext" >&6; }
@@ -3845,8 +3802,8 @@
 if test ${ac_cv_c_compiler_gnu+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3863,14 +3820,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else $as_nop
+  ac_compiler_gnu=no
 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; }
@@ -3888,8 +3843,8 @@
 if test ${ac_cv_prog_cc_g+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_c_werror_flag=$ac_c_werror_flag
+else $as_nop
+  ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
@@ -3907,8 +3862,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_prog_cc_g=yes
-else case e in #(
-  e) CFLAGS=""
+else $as_nop
+  CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3923,8 +3878,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else case e in #(
-  e) ac_c_werror_flag=$ac_save_c_werror_flag
+else $as_nop
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3941,15 +3896,12 @@
 then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+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 ;;
-esac
+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
-   ac_c_werror_flag=$ac_save_c_werror_flag ;;
-esac
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
@@ -3976,8 +3928,8 @@
 if test ${ac_cv_prog_cc_c11+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c11=no
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3994,8 +3946,7 @@
   test "x$ac_cv_prog_cc_c11" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
+CC=$ac_save_CC
 fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
@@ -4002,20 +3953,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c11" = x
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11" ;;
-esac
+     CC="$CC $ac_cv_prog_cc_c11"
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11 ;;
-esac
+  ac_prog_cc_stdc=c11
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
@@ -4025,8 +3974,8 @@
 if test ${ac_cv_prog_cc_c99+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c99=no
+else $as_nop
+  ac_cv_prog_cc_c99=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4043,8 +3992,7 @@
   test "x$ac_cv_prog_cc_c99" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
+CC=$ac_save_CC
 fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
@@ -4051,20 +3999,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c99" = x
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99" ;;
-esac
+     CC="$CC $ac_cv_prog_cc_c99"
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99 ;;
-esac
+  ac_prog_cc_stdc=c99
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
@@ -4074,8 +4020,8 @@
 if test ${ac_cv_prog_cc_c89+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c89=no
+else $as_nop
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4092,8 +4038,7 @@
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
+CC=$ac_save_CC
 fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
@@ -4100,20 +4045,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c89" = x
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89" ;;
-esac
+     CC="$CC $ac_cv_prog_cc_c89"
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89 ;;
-esac
+  ac_prog_cc_stdc=c89
 fi
 fi
 
@@ -4158,8 +4101,8 @@
 if test ${ac_cv_c_bigendian+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_c_bigendian=unknown
+else $as_nop
+  ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4205,8 +4148,8 @@
 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
@@ -4237,9 +4180,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_bigendian=yes
-else case e in #(
-  e) ac_cv_c_bigendian=no ;;
-esac
+else $as_nop
+  ac_cv_c_bigendian=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
@@ -4283,9 +4225,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_bigendian=yes
-else case e in #(
-  e) ac_cv_c_bigendian=no ;;
-esac
+else $as_nop
+  ac_cv_c_bigendian=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
@@ -4312,23 +4253,22 @@
 		int use_ebcdic (int i) {
 		  return ebcdic_mm[i] + ebcdic_ii[i];
 		}
-		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);
-		}
+		extern int foo;
+
+int
+main (void)
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
+if ac_fn_c_try_compile "$LINENO"
 then :
-  if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
-	    if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
 	      if test "$ac_cv_c_bigendian" = unknown; then
 		ac_cv_c_bigendian=no
 	      else
@@ -4337,10 +4277,9 @@
 	      fi
 	    fi
 fi
-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
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -4363,17 +4302,14 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_c_bigendian=no
-else case e in #(
-  e) ac_cv_c_bigendian=yes ;;
-esac
+else $as_nop
+  ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-    fi ;;
-esac
+    fi
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
 printf "%s\n" "$ac_cv_c_bigendian" >&6; }
@@ -4405,8 +4341,8 @@
 if test ${ac_cv_build+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_build_alias=$build_alias
+else $as_nop
+  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 &&
@@ -4413,8 +4349,7 @@
   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; }
@@ -4441,15 +4376,14 @@
 if test ${ac_cv_host+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test "x$host_alias" = x; then
+else $as_nop
+  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; }
@@ -4505,8 +4439,8 @@
                         latexdir=$withval
                       fi
 
-else case e in #(
-  e)
+else $as_nop
+
 # Extract the first word of "kpsewhich", so it can be a program name with args.
 set dummy kpsewhich; ac_word=$2
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -4514,8 +4448,8 @@
 if test ${ac_cv_prog_kpsewhich+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$kpsewhich"; then
+else $as_nop
+  if test -n "$kpsewhich"; then
   ac_cv_prog_kpsewhich="$kpsewhich" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4537,9 +4471,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 kpsewhich=$ac_cv_prog_kpsewhich
 if test -n "$kpsewhich"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpsewhich" >&5
@@ -4554,22 +4487,21 @@
   latexdir=`kpsewhich -expand-var='$TEXMFLOCAL'/tex/latex`
 else
   latexdir=$prefix/share/texmf/tex/latex
-  as_ac_File=`printf "%s\n" "ac_cv_file_$latexdir/base/latex.ltx" | sed "$as_sed_sh"`
+  as_ac_File=`printf "%s\n" "ac_cv_file_$latexdir/base/latex.ltx" | $as_tr_sh`
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $latexdir/base/latex.ltx" >&5
 printf %s "checking for $latexdir/base/latex.ltx... " >&6; }
 if eval test \${$as_ac_File+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) test "$cross_compiling" = yes &&
+else $as_nop
+  test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$latexdir/base/latex.ltx"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
-fi ;;
-esac
 fi
+fi
 eval ac_res=\$$as_ac_File
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 printf "%s\n" "$ac_res" >&6; }
@@ -4576,24 +4508,23 @@
 if eval test \"x\$"$as_ac_File"\" = x"yes"
 then :
 
-else case e in #(
-  e) latexdir=/usr/share/texmf/tex/latex
-  as_ac_File=`printf "%s\n" "ac_cv_file_$latexdir/base/latex.ltx" | sed "$as_sed_sh"`
+else $as_nop
+  latexdir=/usr/share/texmf/tex/latex
+  as_ac_File=`printf "%s\n" "ac_cv_file_$latexdir/base/latex.ltx" | $as_tr_sh`
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $latexdir/base/latex.ltx" >&5
 printf %s "checking for $latexdir/base/latex.ltx... " >&6; }
 if eval test \${$as_ac_File+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) test "$cross_compiling" = yes &&
+else $as_nop
+  test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$latexdir/base/latex.ltx"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
-fi ;;
-esac
 fi
+fi
 eval ac_res=\$$as_ac_File
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 printf "%s\n" "$ac_res" >&6; }
@@ -4601,13 +4532,11 @@
 then :
 
 fi
- ;;
-esac
+
 fi
 
 fi
- ;;
-esac
+
 fi
 
 
@@ -4619,8 +4548,8 @@
                         contextdir=$withval
                       fi
 
-else case e in #(
-  e)
+else $as_nop
+
 # Extract the first word of "kpsewhich", so it can be a program name with args.
 set dummy kpsewhich; ac_word=$2
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -4628,8 +4557,8 @@
 if test ${ac_cv_prog_kpsewhich+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$kpsewhich"; then
+else $as_nop
+  if test -n "$kpsewhich"; then
   ac_cv_prog_kpsewhich="$kpsewhich" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4651,9 +4580,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 kpsewhich=$ac_cv_prog_kpsewhich
 if test -n "$kpsewhich"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpsewhich" >&5
@@ -4669,8 +4597,7 @@
 else
   contextdir=$prefix/share/texmf/tex/context/third
 fi
- ;;
-esac
+
 fi
 
 
@@ -4683,8 +4610,8 @@
 if test ${ac_cv_prog_TEXI2DVI+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$TEXI2DVI"; then
+else $as_nop
+  if test -n "$TEXI2DVI"; then
   ac_cv_prog_TEXI2DVI="$TEXI2DVI" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4706,9 +4633,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 TEXI2DVI=$ac_cv_prog_TEXI2DVI
 if test -n "$TEXI2DVI"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TEXI2DVI" >&5
@@ -4805,8 +4731,8 @@
 if test ${ac_cv_prog_CXX+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CXX"; then
+else $as_nop
+  if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4828,9 +4754,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
@@ -4855,8 +4780,8 @@
 if test ${ac_cv_prog_ac_ct_CXX+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CXX"; then
+else $as_nop
+  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
@@ -4878,9 +4803,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
@@ -4939,8 +4863,8 @@
 if test ${ac_cv_cxx_compiler_gnu+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4957,14 +4881,12 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else $as_nop
+  ac_compiler_gnu=no
 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; }
@@ -4982,8 +4904,8 @@
 if test ${ac_cv_prog_cxx_g+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+else $as_nop
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
@@ -5001,8 +4923,8 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_cv_prog_cxx_g=yes
-else case e in #(
-  e) CXXFLAGS=""
+else $as_nop
+  CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5017,8 +4939,8 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
 
-else case e in #(
-  e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else $as_nop
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5035,15 +4957,12 @@
 then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+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 ;;
-esac
+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
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
-esac
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 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; }
@@ -5070,8 +4989,8 @@
 if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx11=no
+else $as_nop
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5088,8 +5007,7 @@
   test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
+CXX=$ac_save_CXX
 fi
 
 if test "x$ac_cv_prog_cxx_cxx11" = xno
@@ -5096,20 +5014,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx11" = x
+else $as_nop
+  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 case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+else $as_nop
+  { 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" ;;
-esac
+     CXX="$CXX $ac_cv_prog_cxx_cxx11"
 fi
   ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11 ;;
-esac
+  ac_prog_cxx_stdcxx=cxx11
 fi
 fi
 if test x$ac_prog_cxx_stdcxx = xno
@@ -5119,8 +5035,8 @@
 if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx98=no
+else $as_nop
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5137,8 +5053,7 @@
   test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
+CXX=$ac_save_CXX
 fi
 
 if test "x$ac_cv_prog_cxx_cxx98" = xno
@@ -5145,20 +5060,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx98" = x
+else $as_nop
+  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 case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+else $as_nop
+  { 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" ;;
-esac
+     CXX="$CXX $ac_cv_prog_cxx_cxx98"
 fi
   ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98 ;;
-esac
+  ac_prog_cxx_stdcxx=cxx98
 fi
 fi
 
@@ -5178,8 +5091,8 @@
 if test ${ac_cv_prog_LEX+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$LEX"; then
+else $as_nop
+  if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5201,9 +5114,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
@@ -5260,8 +5172,8 @@
 if test ${ac_cv_prog_lex_root+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e)
+else $as_nop
+
 ac_cv_prog_lex_root=unknown
 { { ac_try="$LEX conftest.l"
 case "(($ac_try" in
@@ -5278,9 +5190,8 @@
   ac_cv_prog_lex_root=lex.yy
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
-fi ;;
-esac
 fi
+fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
 printf "%s\n" "$ac_cv_prog_lex_root" >&6; }
 if test "$ac_cv_prog_lex_root" = unknown
@@ -5294,15 +5205,15 @@
 if test ${LEXLIB+y}
 then :
 
-else case e in #(
-  e)
+else $as_nop
+
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex library" >&5
 printf %s "checking for lex library... " >&6; }
 if test ${ac_cv_lib_lex+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e)
+else $as_nop
+
     ac_save_LIBS="$LIBS"
     ac_found=false
     for ac_cv_lib_lex in 'none needed' -lfl -ll 'not found'; do
@@ -5332,8 +5243,7 @@
       fi
     done
     LIBS="$ac_save_LIBS"
-   ;;
-esac
+
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
 printf "%s\n" "$ac_cv_lib_lex" >&6; }
@@ -5345,12 +5255,10 @@
 elif test "$ac_cv_lib_lex" = 'none needed'
 then :
   LEXLIB=''
-else case e in #(
-  e) LEXLIB=$ac_cv_lib_lex ;;
-esac
+else $as_nop
+  LEXLIB=$ac_cv_lib_lex
 fi
-   ;;
-esac
+
 fi
 
 
@@ -5362,8 +5270,8 @@
 if test ${ac_cv_prog_lex_yytext_pointer+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) # POSIX says lex can declare yytext either as a pointer or an array; the
+else $as_nop
+  # POSIX says lex can declare yytext either as a pointer or an array; the
 # default is implementation-dependent.  Figure out which it is, since
 # not all implementations provide the %pointer and %array declarations.
 ac_cv_prog_lex_yytext_pointer=no
@@ -5378,8 +5286,7 @@
   ac_cv_prog_lex_yytext_pointer=yes
 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_lex_yytext_pointer" >&5
 printf "%s\n" "$ac_cv_prog_lex_yytext_pointer" >&6; }
@@ -5412,8 +5319,8 @@
 if test ${ac_cv_prog_CXX+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CXX"; then
+else $as_nop
+  if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5435,9 +5342,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
@@ -5462,8 +5368,8 @@
 if test ${ac_cv_prog_ac_ct_CXX+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CXX"; then
+else $as_nop
+  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
@@ -5485,9 +5391,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
@@ -5546,8 +5451,8 @@
 if test ${ac_cv_cxx_compiler_gnu+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5564,14 +5469,12 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else $as_nop
+  ac_compiler_gnu=no
 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; }
@@ -5589,8 +5492,8 @@
 if test ${ac_cv_prog_cxx_g+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+else $as_nop
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
@@ -5608,8 +5511,8 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_cv_prog_cxx_g=yes
-else case e in #(
-  e) CXXFLAGS=""
+else $as_nop
+  CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5624,8 +5527,8 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
 
-else case e in #(
-  e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else $as_nop
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5642,15 +5545,12 @@
 then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+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 ;;
-esac
+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
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
-esac
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 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; }
@@ -5677,8 +5577,8 @@
 if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx11=no
+else $as_nop
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5695,8 +5595,7 @@
   test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
+CXX=$ac_save_CXX
 fi
 
 if test "x$ac_cv_prog_cxx_cxx11" = xno
@@ -5703,20 +5602,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx11" = x
+else $as_nop
+  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 case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+else $as_nop
+  { 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" ;;
-esac
+     CXX="$CXX $ac_cv_prog_cxx_cxx11"
 fi
   ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11 ;;
-esac
+  ac_prog_cxx_stdcxx=cxx11
 fi
 fi
 if test x$ac_prog_cxx_stdcxx = xno
@@ -5726,8 +5623,8 @@
 if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx98=no
+else $as_nop
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5744,8 +5641,7 @@
   test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
+CXX=$ac_save_CXX
 fi
 
 if test "x$ac_cv_prog_cxx_cxx98" = xno
@@ -5752,20 +5648,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx98" = x
+else $as_nop
+  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 case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+else $as_nop
+  { 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" ;;
-esac
+     CXX="$CXX $ac_cv_prog_cxx_cxx98"
 fi
   ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98 ;;
-esac
+  ac_prog_cxx_stdcxx=cxx98
 fi
 fi
 
@@ -5796,8 +5690,8 @@
 if test ${ac_cv_path_install+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else $as_nop
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
@@ -5851,8 +5745,7 @@
 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
@@ -5888,8 +5781,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5911,9 +5804,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -5934,8 +5826,8 @@
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CC"; then
+else $as_nop
+  if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5957,9 +5849,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
@@ -5993,8 +5884,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6016,9 +5907,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -6039,8 +5929,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
@@ -6079,9 +5969,8 @@
     ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -6104,8 +5993,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6127,9 +6016,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -6154,8 +6042,8 @@
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CC"; then
+else $as_nop
+  if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6177,9 +6065,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
@@ -6216,8 +6103,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+else $as_nop
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6239,9 +6126,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
@@ -6262,8 +6148,8 @@
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CC"; then
+else $as_nop
+  if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6285,9 +6171,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
@@ -6315,10 +6200,10 @@
 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
@@ -6350,8 +6235,8 @@
 if test ${ac_cv_c_compiler_gnu+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6368,14 +6253,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else $as_nop
+  ac_compiler_gnu=no
 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; }
@@ -6393,8 +6276,8 @@
 if test ${ac_cv_prog_cc_g+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_c_werror_flag=$ac_c_werror_flag
+else $as_nop
+  ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
@@ -6412,8 +6295,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_prog_cc_g=yes
-else case e in #(
-  e) CFLAGS=""
+else $as_nop
+  CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6428,8 +6311,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else case e in #(
-  e) ac_c_werror_flag=$ac_save_c_werror_flag
+else $as_nop
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6446,15 +6329,12 @@
 then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+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 ;;
-esac
+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
-   ac_c_werror_flag=$ac_save_c_werror_flag ;;
-esac
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
@@ -6481,8 +6361,8 @@
 if test ${ac_cv_prog_cc_c11+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c11=no
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6499,8 +6379,7 @@
   test "x$ac_cv_prog_cc_c11" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
+CC=$ac_save_CC
 fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
@@ -6507,20 +6386,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c11" = x
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11" ;;
-esac
+     CC="$CC $ac_cv_prog_cc_c11"
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11 ;;
-esac
+  ac_prog_cc_stdc=c11
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
@@ -6530,8 +6407,8 @@
 if test ${ac_cv_prog_cc_c99+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c99=no
+else $as_nop
+  ac_cv_prog_cc_c99=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6548,8 +6425,7 @@
   test "x$ac_cv_prog_cc_c99" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
+CC=$ac_save_CC
 fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
@@ -6556,20 +6432,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c99" = x
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99" ;;
-esac
+     CC="$CC $ac_cv_prog_cc_c99"
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99 ;;
-esac
+  ac_prog_cc_stdc=c99
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
@@ -6579,8 +6453,8 @@
 if test ${ac_cv_prog_cc_c89+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c89=no
+else $as_nop
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6597,8 +6471,7 @@
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
+CC=$ac_save_CC
 fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
@@ -6605,20 +6478,18 @@
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c89" = x
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89" ;;
-esac
+     CC="$CC $ac_cv_prog_cc_c89"
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89 ;;
-esac
+  ac_prog_cc_stdc=c89
 fi
 fi
 
@@ -6635,8 +6506,8 @@
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat >conftest.make <<\_ACEOF
+else $as_nop
+  cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
@@ -6648,8 +6519,7 @@
   *)
     eval ac_cv_prog_make_${ac_make}_set=no;;
 esac
-rm -f conftest.make ;;
-esac
+rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -6670,8 +6540,8 @@
 if test ${ac_cv_prog_BISON+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$BISON"; then
+else $as_nop
+  if test -n "$BISON"; then
   ac_cv_prog_BISON="$BISON" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6694,9 +6564,8 @@
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_BISON" && ac_cv_prog_BISON="no"
-fi ;;
-esac
 fi
+fi
 BISON=$ac_cv_prog_BISON
 if test -n "$BISON"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
@@ -6720,8 +6589,8 @@
 if test ${ac_cv_prog_FLEX+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$FLEX"; then
+else $as_nop
+  if test -n "$FLEX"; then
   ac_cv_prog_FLEX="$FLEX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6744,9 +6613,8 @@
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_FLEX" && ac_cv_prog_FLEX="no"
-fi ;;
-esac
 fi
+fi
 FLEX=$ac_cv_prog_FLEX
 if test -n "$FLEX"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
@@ -6802,8 +6670,8 @@
 
 printf "%s\n" "#define HAVE_TR1_UNORDERED_MAP 1" >>confdefs.h
 
-else case e in #(
-  e)
+else $as_nop
+
   ac_fn_cxx_check_header_compile "$LINENO" "unordered_map" "ac_cv_header_unordered_map" "$ac_includes_default"
 if test "x$ac_cv_header_unordered_map" = xyes
 then :
@@ -6810,20 +6678,17 @@
 
 printf "%s\n" "#define HAVE_UNORDERED_MAP 1" >>confdefs.h
 
-else case e in #(
-  e) ac_fn_cxx_check_header_compile "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" "$ac_includes_default"
+else $as_nop
+  ac_fn_cxx_check_header_compile "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" "$ac_includes_default"
 if test "x$ac_cv_header_ext_hash_map" = xyes
 then :
 
-else case e in #(
-  e) OPTIONS=$OPTIONS"-DNOHASH " ;;
-esac
+else $as_nop
+  OPTIONS=$OPTIONS"-DNOHASH "
 fi
- ;;
-esac
+
 fi
- ;;
-esac
+
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
@@ -6835,22 +6700,21 @@
 GCFILE=gc-$GCVERSION
 ac_cv_use_gc="system"
 
-as_ac_File=`printf "%s\n" "ac_cv_file_$GCFILE.tar.gz" | sed "$as_sed_sh"`
+as_ac_File=`printf "%s\n" "ac_cv_file_$GCFILE.tar.gz" | $as_tr_sh`
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $GCFILE.tar.gz" >&5
 printf %s "checking for $GCFILE.tar.gz... " >&6; }
 if eval test \${$as_ac_File+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) test "$cross_compiling" = yes &&
+else $as_nop
+  test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$GCFILE.tar.gz"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
-fi ;;
-esac
 fi
+fi
 eval ac_res=\$$as_ac_File
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 printf "%s\n" "$ac_res" >&6; }
@@ -6896,8 +6760,8 @@
 if test ${ac_cv_lib_gc_GC_malloc+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6916,14 +6780,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_gc_GC_malloc=yes
-else case e in #(
-  e) ac_cv_lib_gc_GC_malloc=no ;;
-esac
+else $as_nop
+  ac_cv_lib_gc_GC_malloc=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5
 printf "%s\n" "$ac_cv_lib_gc_GC_malloc" >&6; }
@@ -6933,23 +6795,21 @@
           LIBS=$LIBS"-lgc "
           { printf "%s\n" "$as_me:${as_lineno-$LINENO}: enabling system $GCNAME" >&5
 printf "%s\n" "$as_me: enabling system $GCNAME" >&6;}
-else case e in #(
-  e)
+else $as_nop
+
         GCDIR=$GCFILE
         INCL="-I. -I\$(GC)/include"
         GCLIB="\$(GC)/.libs/libgc.a"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $GCNAME library not found" >&5
-printf "%s\n" "$as_me: $GCNAME library not found" >&6;} ;;
-esac
+printf "%s\n" "$as_me: $GCNAME library not found" >&6;}
 fi
 
-else case e in #(
-  e) GCDIR=$GCFILE
+else $as_nop
+  GCDIR=$GCFILE
       GCLIB="\$(GC)/.libs/libgc.a"
       INCL="-I. -I\$(GC)/include"
       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $GCNAME header file not found" >&5
-printf "%s\n" "$as_me: $GCNAME header file not found" >&6;} ;;
-esac
+printf "%s\n" "$as_me: $GCNAME header file not found" >&6;}
 fi
 
       CPPFLAGS=$CPPFLAGS_SAVE
@@ -7012,9 +6872,8 @@
 
 printf "%s\n" "#define HAVE_GNU_GETOPT_H 1" >>confdefs.h
 
-else case e in #(
-  e) getopt="getopt getopt1" ;;
-esac
+else $as_nop
+  getopt="getopt getopt1"
 fi
 
 
@@ -7038,8 +6897,8 @@
 if test ${ac_cv_lib_z_deflate+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7058,14 +6917,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_z_deflate=yes
-else case e in #(
-  e) ac_cv_lib_z_deflate=no ;;
-esac
+else $as_nop
+  ac_cv_lib_z_deflate=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 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; }
@@ -7075,9 +6932,8 @@
 
   LIBS="-lz $LIBS"
 
-else case e in #(
-  e) as_fn_error $? "*** Please install libz or zlib-devel on your system ***" "$LINENO" 5 ;;
-esac
+else $as_nop
+  as_fn_error $? "*** Please install libz or zlib-devel on your system ***" "$LINENO" 5
 fi
 
 
@@ -7119,14 +6975,8 @@
 
 /* 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.
-   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 pthread_join (void);
+   builtin and then its argument prototype would still apply.  */
+char pthread_join ();
 int
 main (void)
 {
@@ -7225,8 +7075,8 @@
 if test ${ac_cv_prog_ax_pthread_config+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ax_pthread_config"; then
+else $as_nop
+  if test -n "$ax_pthread_config"; then
   ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7249,9 +7099,8 @@
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no"
-fi ;;
-esac
 fi
+fi
 ax_pthread_config=$ac_cv_prog_ax_pthread_config
 if test -n "$ax_pthread_config"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
@@ -7390,8 +7239,8 @@
 if test ${ax_cv_PTHREAD_PRIO_INHERIT+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e)
+else $as_nop
+
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7407,14 +7256,12 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ax_cv_PTHREAD_PRIO_INHERIT=yes
-else case e in #(
-  e) ax_cv_PTHREAD_PRIO_INHERIT=no ;;
-esac
+else $as_nop
+  ax_cv_PTHREAD_PRIO_INHERIT=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-             ;;
-esac
+
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
 printf "%s\n" "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
@@ -7439,8 +7286,8 @@
 if test ${ac_cv_prog_PTHREAD_CC+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$PTHREAD_CC"; then
+else $as_nop
+  if test -n "$PTHREAD_CC"; then
   ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7462,9 +7309,8 @@
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
 fi
+fi
 PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
 if test -n "$PTHREAD_CC"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
@@ -7524,8 +7370,8 @@
 if test ${ac_cv_lib_sigsegv_stackoverflow_install_handler+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsigsegv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7544,14 +7390,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_sigsegv_stackoverflow_install_handler=yes
-else case e in #(
-  e) ac_cv_lib_sigsegv_stackoverflow_install_handler=no ;;
-esac
+else $as_nop
+  ac_cv_lib_sigsegv_stackoverflow_install_handler=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sigsegv_stackoverflow_install_handler" >&5
 printf "%s\n" "$ac_cv_lib_sigsegv_stackoverflow_install_handler" >&6; }
@@ -7570,8 +7414,8 @@
 if test ${ac_cv_lib_rt_sched_yield+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7590,14 +7434,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_rt_sched_yield=yes
-else case e in #(
-  e) ac_cv_lib_rt_sched_yield=no ;;
-esac
+else $as_nop
+  ac_cv_lib_rt_sched_yield=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
 printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; }
@@ -7622,8 +7464,8 @@
 if test ${ac_cv_lib_curl_curl_easy_init+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7642,14 +7484,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_curl_curl_easy_init=yes
-else case e in #(
-  e) ac_cv_lib_curl_curl_easy_init=no ;;
-esac
+else $as_nop
+  ac_cv_lib_curl_curl_easy_init=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5
 printf "%s\n" "$ac_cv_lib_curl_curl_easy_init" >&6; }
@@ -7659,10 +7499,9 @@
 
   LIBS="-lcurl $LIBS"
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libcurl: will compile without optional URL support. ***" >&5
-printf "%s\n" "$as_me: *** Could not find libcurl: will compile without optional URL support. ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libcurl: will compile without optional URL support. ***" >&5
+printf "%s\n" "$as_me: *** Could not find libcurl: will compile without optional URL support. ***" >&6;}
 fi
 
 else
@@ -7678,8 +7517,8 @@
 if test ${ac_cv_lib_boost_filesystem_opendir+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lboost_filesystem  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7698,14 +7537,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_boost_filesystem_opendir=yes
-else case e in #(
-  e) ac_cv_lib_boost_filesystem_opendir=no ;;
-esac
+else $as_nop
+  ac_cv_lib_boost_filesystem_opendir=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_filesystem_opendir" >&5
 printf "%s\n" "$ac_cv_lib_boost_filesystem_opendir" >&6; }
@@ -7716,8 +7553,8 @@
 if test ${ac_cv_lib_boost_thread_pthread_attr_getdetachstate+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lboost_thread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7736,14 +7573,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_boost_thread_pthread_attr_getdetachstate=yes
-else case e in #(
-  e) ac_cv_lib_boost_thread_pthread_attr_getdetachstate=no ;;
-esac
+else $as_nop
+  ac_cv_lib_boost_thread_pthread_attr_getdetachstate=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_thread_pthread_attr_getdetachstate" >&5
 printf "%s\n" "$ac_cv_lib_boost_thread_pthread_attr_getdetachstate" >&6; }
@@ -7754,16 +7589,14 @@
 
    LSPLIBS="-llspcpp -lnetwork-uri -lboost_filesystem -lboost_thread "
    LSPLIB=liblspcpp.a
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libboost_thread: will compile without optional Language Server Protocol. ***" >&5
-printf "%s\n" "$as_me: *** Could not find libboost_thread: will compile without optional Language Server Protocol. ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libboost_thread: will compile without optional Language Server Protocol. ***" >&5
+printf "%s\n" "$as_me: *** Could not find libboost_thread: will compile without optional Language Server Protocol. ***" >&6;}
 fi
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libboost_filesystem: will compile without optional Language Server Protocol. ***" >&5
-printf "%s\n" "$as_me: *** Could not find libboost_filesystem: will compile without optional Language Server Protocol. ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libboost_filesystem: will compile without optional Language Server Protocol. ***" >&5
+printf "%s\n" "$as_me: *** Could not find libboost_filesystem: will compile without optional Language Server Protocol. ***" >&6;}
 fi
 
 fi
@@ -7782,9 +7615,11 @@
 fi
 
 
+LDSTATIC=""
 STATIC=""
 DYNAMIC=""
 if test "x$enable_static" = "xyes"; then
+  LDSTATIC="-static "
   STATIC="-Wl,-Bstatic "
   DYNAMIC="-Wl,-Bdynamic "
 fi
@@ -7793,8 +7628,11 @@
 
 
 
+
+
 if test "x$enable_readline" != "xno"; then
 CPPFLAGS="$CPPFLAGS "`pkg-config --cflags readline`
+LDFLAGS="$LDFLAGS "`pkg-config --libs readline`
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7818,20 +7656,15 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
 
-PKGFLAGS=`pkg-config --silence-errors --libs readline`
-if test "x$PKGFLAGS" == "x"; then
-PKGFLAGS=-l"readline "
-echo Will try linking with $PKGFLAGS
-fi
-LDFLAGS_SAVE=$LDFLAGS
-LDFLAGS="$LDFLAGS ""$STATIC ""$PKGFLAGS""$DYNAMIC "
+LDFLAGS0=$LDFLAGS
+LDFLAGS=$LDFLAGS$LDSTATIC
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5
 printf %s "checking for history_list in -lreadline... " >&6; }
 if test ${ac_cv_lib_readline_history_list+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7850,14 +7683,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_readline_history_list=yes
-else case e in #(
-  e) ac_cv_lib_readline_history_list=no ;;
-esac
+else $as_nop
+  ac_cv_lib_readline_history_list=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5
 printf "%s\n" "$ac_cv_lib_readline_history_list" >&6; }
@@ -7864,20 +7695,23 @@
 if test "x$ac_cv_lib_readline_history_list" = xyes
 then :
 
+
 printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h
 
-else case e in #(
-  e) if test "x$enable_static" = "xyes"; then
+LIBS=$LIBS$STATIC"-lreadline "$DYNAMIC
 
-LDFLAGS="$LDFLAGS_SAVE ""$PKGFLAGS"
+else $as_nop
+  if test "x$enable_static" = "xyes"; then
+
 { ac_cv_lib_readline_history_list=; unset ac_cv_lib_readline_history_list;}
+LDFLAGS=$LDFLAGS0
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5
 printf %s "checking for history_list in -lreadline... " >&6; }
 if test ${ac_cv_lib_readline_history_list+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7896,14 +7730,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_readline_history_list=yes
-else case e in #(
-  e) ac_cv_lib_readline_history_list=no ;;
-esac
+else $as_nop
+  ac_cv_lib_readline_history_list=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5
 printf "%s\n" "$ac_cv_lib_readline_history_list" >&6; }
@@ -7913,8 +7745,8 @@
 
   LIBS="-lreadline $LIBS"
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&5
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&5
 printf "%s\n" "$as_me: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&6;}
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
 printf %s "checking for readline in -ledit... " >&6; }
@@ -7921,8 +7753,8 @@
 if test ${ac_cv_lib_edit_readline+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7941,14 +7773,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_edit_readline=yes
-else case e in #(
-  e) ac_cv_lib_edit_readline=no ;;
-esac
+else $as_nop
+  ac_cv_lib_edit_readline=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
 printf "%s\n" "$ac_cv_lib_edit_readline" >&6; }
@@ -7967,8 +7797,7 @@
 
 fi
 
- ;;
-esac
+
 fi
 
 
@@ -7981,8 +7810,8 @@
 if test ${ac_cv_lib_edit_readline+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8001,14 +7830,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_edit_readline=yes
-else case e in #(
-  e) ac_cv_lib_edit_readline=no ;;
-esac
+else $as_nop
+  ac_cv_lib_edit_readline=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
 printf "%s\n" "$ac_cv_lib_edit_readline" >&6; }
@@ -8029,13 +7856,13 @@
 
 
 fi
- ;;
-esac
+
 fi
 
+LDFLAGS=$LDFLAGS0
 
-else case e in #(
-  e)
+else $as_nop
+
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&5
 printf "%s\n" "$as_me: *** Could not find GNU readline 4.3 or later: will compile without readline support ***" >&6;}
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
@@ -8043,8 +7870,8 @@
 if test ${ac_cv_lib_edit_readline+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8063,14 +7890,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_edit_readline=yes
-else case e in #(
-  e) ac_cv_lib_edit_readline=no ;;
-esac
+else $as_nop
+  ac_cv_lib_edit_readline=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
 printf "%s\n" "$ac_cv_lib_edit_readline" >&6; }
@@ -8089,27 +7914,20 @@
 
 fi
 
- ;;
-esac
+
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-CPPFLAGS="$CPPFLAGS "`pkg-config --cflags tinfo`
 
-PKGFLAGS=`pkg-config --silence-errors --libs tinfo`
-if test "x$PKGFLAGS" == "x"; then
-PKGFLAGS=-l"tinfo "
-echo Will try linking with $PKGFLAGS
-fi
-LDFLAGS_SAVE=$LDFLAGS
-LDFLAGS="$LDFLAGS ""$STATIC ""$PKGFLAGS""$DYNAMIC "
+LDFLAGS0=$LDFLAGS
+LDFLAGS=$LDFLAGS$LDSTATIC
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
 printf %s "checking for tgetent in -ltinfo... " >&6; }
 if test ${ac_cv_lib_tinfo_tgetent+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltinfo  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8128,14 +7946,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_tinfo_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_tinfo_tgetent=no ;;
-esac
+else $as_nop
+  ac_cv_lib_tinfo_tgetent=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5
 printf "%s\n" "$ac_cv_lib_tinfo_tgetent" >&6; }
@@ -8142,20 +7958,23 @@
 if test "x$ac_cv_lib_tinfo_tgetent" = xyes
 then :
 
+
 printf "%s\n" "#define HAVE_LIBTINFO 1" >>confdefs.h
 
-else case e in #(
-  e) if test "x$enable_static" = "xyes"; then
+LIBS=$LIBS$STATIC"-ltinfo "$DYNAMIC
 
-LDFLAGS="$LDFLAGS_SAVE ""$PKGFLAGS"
+else $as_nop
+  if test "x$enable_static" = "xyes"; then
+
 { ac_cv_lib_tinfo_tgetent=; unset ac_cv_lib_tinfo_tgetent;}
+LDFLAGS=$LDFLAGS0
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
 printf %s "checking for tgetent in -ltinfo... " >&6; }
 if test ${ac_cv_lib_tinfo_tgetent+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltinfo  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8174,14 +7993,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_tinfo_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_tinfo_tgetent=no ;;
-esac
+else $as_nop
+  ac_cv_lib_tinfo_tgetent=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5
 printf "%s\n" "$ac_cv_lib_tinfo_tgetent" >&6; }
@@ -8191,10 +8008,9 @@
 
   LIBS="-ltinfo $LIBS"
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: perhaps tgetent is in -lncurses" >&5
-printf "%s\n" "$as_me: perhaps tgetent is in -lncurses" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: perhaps tgetent is in -lncurses" >&5
+printf "%s\n" "$as_me: perhaps tgetent is in -lncurses" >&6;}
 fi
 
 
@@ -8202,21 +8018,20 @@
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: perhaps tgetent is in -lncurses" >&5
 printf "%s\n" "$as_me: perhaps tgetent is in -lncurses" >&6;}
 fi
- ;;
-esac
+
 fi
 
+LDFLAGS=$LDFLAGS0
 
 
-CPPFLAGS="$CPPFLAGS "`pkg-config --cflags ncurses`
        for ac_header in ncurses/curses.h ncurses.h curses.h
 do :
-  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
+  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"
 then :
   cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
+#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -8223,20 +8038,15 @@
 
 done
 
-PKGFLAGS=`pkg-config --silence-errors --libs ncurses`
-if test "x$PKGFLAGS" == "x"; then
-PKGFLAGS=-l"ncurses "
-echo Will try linking with $PKGFLAGS
-fi
-LDFLAGS_SAVE=$LDFLAGS
-LDFLAGS="$LDFLAGS ""$STATIC ""$PKGFLAGS""$DYNAMIC "
+LDFLAGS0=$LDFLAGS
+LDFLAGS=$LDFLAGS$LDSTATIC
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncurses" >&5
 printf %s "checking for setupterm in -lncurses... " >&6; }
 if test ${ac_cv_lib_ncurses_setupterm+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8255,14 +8065,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_ncurses_setupterm=yes
-else case e in #(
-  e) ac_cv_lib_ncurses_setupterm=no ;;
-esac
+else $as_nop
+  ac_cv_lib_ncurses_setupterm=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_setupterm" >&5
 printf "%s\n" "$ac_cv_lib_ncurses_setupterm" >&6; }
@@ -8269,20 +8077,23 @@
 if test "x$ac_cv_lib_ncurses_setupterm" = xyes
 then :
 
+
 printf "%s\n" "#define HAVE_LIBCURSES 1" >>confdefs.h
 
-else case e in #(
-  e) if test "x$enable_static" = "xyes"; then
+LIBS=$LIBS$STATIC"-lncurses "$DYNAMIC
 
-LDFLAGS="$LDFLAGS_SAVE ""$PKGFLAGS"
+else $as_nop
+  if test "x$enable_static" = "xyes"; then
+
 { ac_cv_lib_ncurses_setupterm=; unset ac_cv_lib_ncurses_setupterm;}
+LDFLAGS=$LDFLAGS0
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncurses" >&5
 printf %s "checking for setupterm in -lncurses... " >&6; }
 if test ${ac_cv_lib_ncurses_setupterm+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8301,14 +8112,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_ncurses_setupterm=yes
-else case e in #(
-  e) ac_cv_lib_ncurses_setupterm=no ;;
-esac
+else $as_nop
+  ac_cv_lib_ncurses_setupterm=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_setupterm" >&5
 printf "%s\n" "$ac_cv_lib_ncurses_setupterm" >&6; }
@@ -8318,14 +8127,14 @@
 
   LIBS="-lncurses $LIBS"
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lcurses" >&5
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lcurses" >&5
 printf %s "checking for setupterm in -lcurses... " >&6; }
 if test ${ac_cv_lib_curses_setupterm+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8344,14 +8153,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_curses_setupterm=yes
-else case e in #(
-  e) ac_cv_lib_curses_setupterm=no ;;
-esac
+else $as_nop
+  ac_cv_lib_curses_setupterm=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_setupterm" >&5
 printf "%s\n" "$ac_cv_lib_curses_setupterm" >&6; }
@@ -8362,8 +8169,7 @@
   LIBS="-lcurses $LIBS"
 
 fi
- ;;
-esac
+
 fi
 
 
@@ -8373,8 +8179,8 @@
 if test ${ac_cv_lib_curses_setupterm+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8393,14 +8199,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_curses_setupterm=yes
-else case e in #(
-  e) ac_cv_lib_curses_setupterm=no ;;
-esac
+else $as_nop
+  ac_cv_lib_curses_setupterm=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_setupterm" >&5
 printf "%s\n" "$ac_cv_lib_curses_setupterm" >&6; }
@@ -8413,10 +8217,10 @@
 fi
 
 fi
- ;;
-esac
+
 fi
 
+LDFLAGS=$LDFLAGS0
 
 fi
 
@@ -8429,24 +8233,20 @@
 
 if test "x$enable_fftw" != "xno"; then
 CPPFLAGS="$CPPFLAGS "`pkg-config --cflags fftw3`
+LDFLAGS="$LDFLAGS "`pkg-config --libs fftw3`
 ac_fn_cxx_check_header_compile "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
 if test "x$ac_cv_header_fftw3_h" = xyes
 then :
 
-PKGFLAGS=`pkg-config --silence-errors --libs fftw3`
-if test "x$PKGFLAGS" == "x"; then
-PKGFLAGS=-l"fftw3 "
-echo Will try linking with $PKGFLAGS
-fi
-LDFLAGS_SAVE=$LDFLAGS
-LDFLAGS="$LDFLAGS ""$STATIC ""$PKGFLAGS""$DYNAMIC "
+LDFLAGS0=$LDFLAGS
+LDFLAGS=$LDFLAGS$LDSTATIC
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5
 printf %s "checking for fftw_execute in -lfftw3... " >&6; }
 if test ${ac_cv_lib_fftw3_fftw_execute+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfftw3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8465,14 +8265,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_fftw3_fftw_execute=yes
-else case e in #(
-  e) ac_cv_lib_fftw3_fftw_execute=no ;;
-esac
+else $as_nop
+  ac_cv_lib_fftw3_fftw_execute=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5
 printf "%s\n" "$ac_cv_lib_fftw3_fftw_execute" >&6; }
@@ -8479,20 +8277,23 @@
 if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes
 then :
 
+
 printf "%s\n" "#define HAVE_LIBFFTW3 1" >>confdefs.h
 
-else case e in #(
-  e) if test "x$enable_static" = "xyes"; then
+LIBS=$LIBS$STATIC"-lfftw3 "$DYNAMIC
 
-LDFLAGS="$LDFLAGS_SAVE ""$PKGFLAGS"
+else $as_nop
+  if test "x$enable_static" = "xyes"; then
+
 { ac_cv_lib_fftw3_fftw_execute=; unset ac_cv_lib_fftw3_fftw_execute;}
+LDFLAGS=$LDFLAGS0
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5
 printf %s "checking for fftw_execute in -lfftw3... " >&6; }
 if test ${ac_cv_lib_fftw3_fftw_execute+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfftw3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8511,14 +8312,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_fftw3_fftw_execute=yes
-else case e in #(
-  e) ac_cv_lib_fftw3_fftw_execute=no ;;
-esac
+else $as_nop
+  ac_cv_lib_fftw3_fftw_execute=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_execute" >&5
 printf "%s\n" "$ac_cv_lib_fftw3_fftw_execute" >&6; }
@@ -8528,10 +8327,9 @@
 
   LIBS="-lfftw3 $LIBS"
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&5
-printf "%s\n" "$as_me: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&5
+printf "%s\n" "$as_me: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&6;}
 fi
 
 
@@ -8539,15 +8337,14 @@
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&5
 printf "%s\n" "$as_me: *** Could not find libfftw3: will compile without optional fast Fourier transforms. ***" >&6;}
 fi
- ;;
-esac
+
 fi
 
+LDFLAGS=$LDFLAGS0
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***" >&5
-printf "%s\n" "$as_me: *** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***" >&5
+printf "%s\n" "$as_me: *** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***" >&6;}
 fi
 
 fi
@@ -8576,8 +8373,8 @@
 if test ${ac_cv_header_sys_wait_h+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -8601,12 +8398,10 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_cv_header_sys_wait_h=yes
-else case e in #(
-  e) ac_cv_header_sys_wait_h=no ;;
-esac
+else $as_nop
+  ac_cv_header_sys_wait_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
 printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; }
@@ -8650,18 +8445,12 @@
 fi
 
 
-# Check whether --enable-xdr was given.
-if test ${enable_xdr+y}
-then :
-  enableval=$enable_xdr;
-fi
-
-if test "x$enable_xdr" != "xno"; then
 case "$OSTYPE" in
      darwin*)
      ;;
      *)
      CPPFLAGS="$CPPFLAGS "`pkg-config --cflags libtirpc`
+     LDFLAGS="$LDFLAGS "`pkg-config --libs libtirpc`
      ;;
 esac
 
@@ -8678,22 +8467,13 @@
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"
 then :
-
-PKGFLAGS=`pkg-config --silence-errors --libs libtirpc`
-if test "x$PKGFLAGS" == "x"; then
-PKGFLAGS=-l"tirpc "
-echo Will try linking with $PKGFLAGS
-fi
-LDFLAGS_SAVE=$LDFLAGS
-LDFLAGS="$LDFLAGS ""$STATIC ""$PKGFLAGS""$DYNAMIC "
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xdrstdio_create in -ltirpc" >&5
-printf %s "checking for xdrstdio_create in -ltirpc... " >&6; }
-if test ${ac_cv_lib_tirpc_xdrstdio_create+y}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing xdrstdio_create" >&5
+printf %s "checking for library containing xdrstdio_create... " >&6; }
+if test ${ac_cv_search_xdrstdio_create+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltirpc  $LIBS"
+else $as_nop
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -8708,95 +8488,51 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"
+for ac_lib in '' nsl tirpc
+do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"
 then :
-  ac_cv_lib_tirpc_xdrstdio_create=yes
-else case e in #(
-  e) ac_cv_lib_tirpc_xdrstdio_create=no ;;
-esac
+  ac_cv_search_xdrstdio_create=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+    conftest$ac_exeext
+  if test ${ac_cv_search_xdrstdio_create+y}
+then :
+  break
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tirpc_xdrstdio_create" >&5
-printf "%s\n" "$ac_cv_lib_tirpc_xdrstdio_create" >&6; }
-if test "x$ac_cv_lib_tirpc_xdrstdio_create" = xyes
+done
+if test ${ac_cv_search_xdrstdio_create+y}
 then :
 
-printf "%s\n" "#define HAVE_LIBTIRPC 1" >>confdefs.h
-
-else case e in #(
-  e) if test "x$enable_static" = "xyes"; then
-
-LDFLAGS="$LDFLAGS_SAVE ""$PKGFLAGS"
-{ ac_cv_lib_tirpc_xdrstdio_create=; unset ac_cv_lib_tirpc_xdrstdio_create;}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xdrstdio_create in -ltirpc" >&5
-printf %s "checking for xdrstdio_create in -ltirpc... " >&6; }
-if test ${ac_cv_lib_tirpc_xdrstdio_create+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltirpc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-namespace conftest {
-  extern "C" int xdrstdio_create ();
-}
-int
-main (void)
-{
-return conftest::xdrstdio_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"
-then :
-  ac_cv_lib_tirpc_xdrstdio_create=yes
-else case e in #(
-  e) ac_cv_lib_tirpc_xdrstdio_create=no ;;
-esac
+else $as_nop
+  ac_cv_search_xdrstdio_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tirpc_xdrstdio_create" >&5
-printf "%s\n" "$ac_cv_lib_tirpc_xdrstdio_create" >&6; }
-if test "x$ac_cv_lib_tirpc_xdrstdio_create" = xyes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_xdrstdio_create" >&5
+printf "%s\n" "$ac_cv_search_xdrstdio_create" >&6; }
+ac_res=$ac_cv_search_xdrstdio_create
+if test "$ac_res" != no
 then :
-  printf "%s\n" "#define HAVE_LIBTIRPC 1" >>confdefs.h
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-  LIBS="-ltirpc $LIBS"
-
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libtirpc; XDR/V3D support disabled ***" >&5
-printf "%s\n" "$as_me: *** Could not find libtirpc; XDR/V3D support disabled ***" >&6;} ;;
-esac
 fi
 
 
-else
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libtirpc; XDR/V3D support disabled ***" >&5
-printf "%s\n" "$as_me: *** Could not find libtirpc; XDR/V3D support disabled ***" >&6;}
-fi
- ;;
-esac
-fi
+printf "%s\n" "#define HAVE_LIBTIRPC 1" >>confdefs.h
 
-
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Broken rpc headers; XDR/V3D support disabled ***" >&5
-printf "%s\n" "$as_me: *** Broken rpc headers; XDR/V3D support disabled ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Broken rpc headers; XDR/V3D support disabled ***" >&5
+printf "%s\n" "$as_me: WARNING: *** Broken rpc headers; XDR/V3D support disabled ***" >&2;}
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
 # Check whether --enable-gsl was given.
 if test ${enable_gsl+y}
@@ -8807,7 +8543,7 @@
 
 if test "x$enable_gsl" != "xno"; then
   CPPFLAGS="$CPPFLAGS "`pkg-config --cflags gsl`
-  LDFLAGS="$LDFLAGS "`pkg-config --silence-errors --libs gsl`
+  LDFLAGS="$LDFLAGS "`pkg-config --libs gsl`
   ac_fn_cxx_check_header_compile "$LINENO" "gsl/gsl_sf.h" "ac_cv_header_gsl_gsl_sf_h" "$ac_includes_default"
 if test "x$ac_cv_header_gsl_gsl_sf_h" = xyes
 then :
@@ -8816,8 +8552,8 @@
 if test ${ac_cv_lib_gsl_gsl_sf_debye_6+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgsl -lgslcblas $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8836,14 +8572,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_gsl_gsl_sf_debye_6=yes
-else case e in #(
-  e) ac_cv_lib_gsl_gsl_sf_debye_6=no ;;
-esac
+else $as_nop
+  ac_cv_lib_gsl_gsl_sf_debye_6=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gsl_gsl_sf_debye_6" >&5
 printf "%s\n" "$ac_cv_lib_gsl_gsl_sf_debye_6" >&6; }
@@ -8852,16 +8586,14 @@
 
 printf "%s\n" "#define HAVE_LIBGSL 1" >>confdefs.h
  LIBS=$LIBS"-lgsl -lgslcblas "
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libgsl: will compile without optional special functions. ***" >&5
-printf "%s\n" "$as_me: *** Could not find libgsl: will compile without optional special functions. ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libgsl: will compile without optional special functions. ***" >&5
+printf "%s\n" "$as_me: *** Could not find libgsl: will compile without optional special functions. ***" >&6;}
 fi
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Header file gsl_sf.h not found: will compile without optional special functions. ***" >&5
-printf "%s\n" "$as_me: *** Header file gsl_sf.h not found: will compile without optional special functions. ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Header file gsl_sf.h not found: will compile without optional special functions. ***" >&5
+printf "%s\n" "$as_me: *** Header file gsl_sf.h not found: will compile without optional special functions. ***" >&6;}
 fi
 
 fi
@@ -8939,10 +8671,9 @@
 
 printf "%s\n" "#define HAVE_LIBGLM 1" >>confdefs.h
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&5
-printf "%s\n" "$as_me: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&5
+printf "%s\n" "$as_me: *** Could not find glm header files: will compile without WebGL or OpenGL support ***" >&6;}
 fi
 
 
@@ -8949,12 +8680,12 @@
 if test "x$enable_gl" != "xno"; then
                            for ac_header in ncurses/curses.h ncurses.h curses.h
 do :
-  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
+  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"
 then :
   cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
+#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -8972,8 +8703,8 @@
 if test ${ac_cv_lib_OpenImageIO_open+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lOpenImageIO  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8992,14 +8723,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_OpenImageIO_open=yes
-else case e in #(
-  e) ac_cv_lib_OpenImageIO_open=no ;;
-esac
+else $as_nop
+  ac_cv_lib_OpenImageIO_open=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OpenImageIO_open" >&5
 printf "%s\n" "$ac_cv_lib_OpenImageIO_open" >&6; }
@@ -9024,8 +8753,8 @@
 if test ${ac_cv_lib_gccpp_GC_throw_bad_alloc+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgccpp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9044,14 +8773,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_gccpp_GC_throw_bad_alloc=yes
-else case e in #(
-  e) ac_cv_lib_gccpp_GC_throw_bad_alloc=no ;;
-esac
+else $as_nop
+  ac_cv_lib_gccpp_GC_throw_bad_alloc=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gccpp_GC_throw_bad_alloc" >&5
 printf "%s\n" "$ac_cv_lib_gccpp_GC_throw_bad_alloc" >&6; }
@@ -9070,10 +8797,9 @@
 printf "%s\n" "#define HAVE_LIBGLUT 1" >>confdefs.h
 
                              LIBS=$LIBS"-lfreeglut "
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libfreeglut: will compile without OpenGL support ***" >&5
-printf "%s\n" "$as_me: *** Could not find libfreeglut: will compile without OpenGL support ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libfreeglut: will compile without OpenGL support ***" >&5
+printf "%s\n" "$as_me: *** Could not find libfreeglut: will compile without OpenGL support ***" >&6;}
 fi
 
               ac_fn_cxx_check_header_compile "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
@@ -9084,10 +8810,9 @@
 
                              LIBS=$LIBS"-lopengl32 "
                              GLEW="glew.o "
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libopengl32: will compile without OpenGL support ***" >&5
-printf "%s\n" "$as_me: *** Could not find libopengl32: will compile without OpenGL support ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libopengl32: will compile without OpenGL support ***" >&5
+printf "%s\n" "$as_me: *** Could not find libopengl32: will compile without OpenGL support ***" >&6;}
 fi
 
         ;;
@@ -9097,8 +8822,8 @@
 if test ${ac_cv_lib_gccpp_GC_throw_bad_alloc+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgccpp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9117,14 +8842,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_gccpp_GC_throw_bad_alloc=yes
-else case e in #(
-  e) ac_cv_lib_gccpp_GC_throw_bad_alloc=no ;;
-esac
+else $as_nop
+  ac_cv_lib_gccpp_GC_throw_bad_alloc=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gccpp_GC_throw_bad_alloc" >&5
 printf "%s\n" "$ac_cv_lib_gccpp_GC_throw_bad_alloc" >&6; }
@@ -9152,10 +8875,9 @@
 
                            LIBS=$LIBS"-framework GLUT -framework OpenGL -framework Cocoa "
                            GLEW="glew.o "
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find GLUT: will compile without OpenGLLUT support ***" >&5
-printf "%s\n" "$as_me: *** Could not find GLUT: will compile without OpenGLLUT support ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find GLUT: will compile without OpenGLLUT support ***" >&5
+printf "%s\n" "$as_me: *** Could not find GLUT: will compile without OpenGLLUT support ***" >&6;}
 fi
 
         ;;
@@ -9165,8 +8887,8 @@
 if test ${ac_cv_lib_gccpp_GC_throw_bad_alloc+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgccpp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9185,14 +8907,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_gccpp_GC_throw_bad_alloc=yes
-else case e in #(
-  e) ac_cv_lib_gccpp_GC_throw_bad_alloc=no ;;
-esac
+else $as_nop
+  ac_cv_lib_gccpp_GC_throw_bad_alloc=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gccpp_GC_throw_bad_alloc" >&5
 printf "%s\n" "$ac_cv_lib_gccpp_GC_throw_bad_alloc" >&6; }
@@ -9209,8 +8929,8 @@
 if test ${ac_cv_lib_glut_glutMainLoop+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lglut  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9229,14 +8949,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_glut_glutMainLoop=yes
-else case e in #(
-  e) ac_cv_lib_glut_glutMainLoop=no ;;
-esac
+else $as_nop
+  ac_cv_lib_glut_glutMainLoop=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glut_glutMainLoop" >&5
 printf "%s\n" "$ac_cv_lib_glut_glutMainLoop" >&6; }
@@ -9246,10 +8964,9 @@
 
   LIBS="-lglut $LIBS"
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libglut: will compile without OpenGL support ***" >&5
-printf "%s\n" "$as_me: *** Could not find libglut: will compile without OpenGL support ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libglut: will compile without OpenGL support ***" >&5
+printf "%s\n" "$as_me: *** Could not find libglut: will compile without OpenGL support ***" >&6;}
 fi
 
          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glDepthMask in -lGL" >&5
@@ -9257,8 +8974,8 @@
 if test ${ac_cv_lib_GL_glDepthMask+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGL  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9277,14 +8994,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_GL_glDepthMask=yes
-else case e in #(
-  e) ac_cv_lib_GL_glDepthMask=no ;;
-esac
+else $as_nop
+  ac_cv_lib_GL_glDepthMask=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glDepthMask" >&5
 printf "%s\n" "$ac_cv_lib_GL_glDepthMask" >&6; }
@@ -9300,8 +9015,8 @@
 if test ${ac_cv_lib_GLX_glXGetProcAddressARB+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGLX  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9320,14 +9035,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_GLX_glXGetProcAddressARB=yes
-else case e in #(
-  e) ac_cv_lib_GLX_glXGetProcAddressARB=no ;;
-esac
+else $as_nop
+  ac_cv_lib_GLX_glXGetProcAddressARB=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLX_glXGetProcAddressARB" >&5
 printf "%s\n" "$ac_cv_lib_GLX_glXGetProcAddressARB" >&6; }
@@ -9336,10 +9049,9 @@
   GLEW=$GLEW"-lGLX "
 fi
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libGL: will compile without OpenGL support ***" >&5
-printf "%s\n" "$as_me: *** Could not find libGL: will compile without OpenGL support ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libGL: will compile without OpenGL support ***" >&5
+printf "%s\n" "$as_me: *** Could not find libGL: will compile without OpenGL support ***" >&6;}
 fi
 
 esac
@@ -9349,8 +9061,8 @@
 if test ${ac_cv_lib_OSMesa_OSMesaCreateContext+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lOSMesa  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9369,14 +9081,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_OSMesa_OSMesaCreateContext=yes
-else case e in #(
-  e) ac_cv_lib_OSMesa_OSMesaCreateContext=no ;;
-esac
+else $as_nop
+  ac_cv_lib_OSMesa_OSMesaCreateContext=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OSMesa_OSMesaCreateContext" >&5
 printf "%s\n" "$ac_cv_lib_OSMesa_OSMesaCreateContext" >&6; }
@@ -9386,10 +9096,9 @@
 
   LIBS="-lOSMesa $LIBS"
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&5
-printf "%s\n" "$as_me: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&6;} ;;
-esac
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&5
+printf "%s\n" "$as_me: *** Could not find libOSMesa: will compile without offscreen rendering support ***" >&6;}
 fi
 
    fi
@@ -9402,8 +9111,8 @@
 if test "x$ac_cv_type_pid_t" = xyes
 then :
 
-else case e in #(
-  e)                                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+                                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
           #if defined _WIN64 && !defined __CYGWIN__
@@ -9422,16 +9131,14 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_pid_type='int'
-else case e in #(
-  e) ac_pid_type='__int64' ;;
-esac
+else $as_nop
+  ac_pid_type='__int64'
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h
 
-     ;;
-esac
+
 fi
 
 
@@ -9439,11 +9146,10 @@
 if test "x$ac_cv_type_size_t" = xyes
 then :
 
-else case e in #(
-  e)
+else $as_nop
+
 printf "%s\n" "#define size_t unsigned int" >>confdefs.h
- ;;
-esac
+
 fi
 
 ac_fn_cxx_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
@@ -9478,8 +9184,8 @@
 if test ${ac_cv_c_const+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9543,12 +9249,10 @@
 if ac_fn_cxx_try_compile "$LINENO"
 then :
   ac_cv_c_const=yes
-else case e in #(
-  e) ac_cv_c_const=no ;;
-esac
+else $as_nop
+  ac_cv_c_const=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
 printf "%s\n" "$ac_cv_c_const" >&6; }
@@ -9563,8 +9267,8 @@
 if test ${ac_cv_c_inline+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_c_inline=no
+else $as_nop
+  ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9582,8 +9286,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
- ;;
-esac
+
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
 printf "%s\n" "$ac_cv_c_inline" >&6; }
@@ -9642,12 +9345,12 @@
 if test ${ac_cv_func_fork_works+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test "$cross_compiling" = yes
+else $as_nop
+  if test "$cross_compiling" = yes
 then :
   ac_cv_func_fork_works=cross
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -9654,7 +9357,7 @@
 main (void)
 {
 
-	  /* By R. Kuhlmann. */
+	  /* By Ruediger Kuhlmann. */
 	  return fork () < 0;
 
   ;
@@ -9664,16 +9367,13 @@
 if ac_fn_cxx_try_run "$LINENO"
 then :
   ac_cv_func_fork_works=yes
-else case e in #(
-  e) ac_cv_func_fork_works=no ;;
-esac
+else $as_nop
+  ac_cv_func_fork_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
 printf "%s\n" "$ac_cv_func_fork_works" >&6; }
@@ -9701,12 +9401,12 @@
 if test ${ac_cv_func_vfork_works+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) if test "$cross_compiling" = yes
+else $as_nop
+  if test "$cross_compiling" = yes
 then :
   ac_cv_func_vfork_works=cross
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Thanks to Paul Eggert for this test.  */
 $ac_includes_default
@@ -9817,16 +9517,13 @@
 if ac_fn_cxx_try_run "$LINENO"
 then :
   ac_cv_func_vfork_works=yes
-else case e in #(
-  e) ac_cv_func_vfork_works=no ;;
-esac
+else $as_nop
+  ac_cv_func_vfork_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
 printf "%s\n" "$ac_cv_func_vfork_works" >&6; }
@@ -9910,15 +9607,15 @@
 then :
   printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h
 
-else case e in #(
-  e) # strftime is in -lintl on SCO UNIX.
+else $as_nop
+  # strftime is in -lintl on SCO UNIX.
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
 printf %s "checking for strftime in -lintl... " >&6; }
 if test ${ac_cv_lib_intl_strftime+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9937,14 +9634,12 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_intl_strftime=yes
-else case e in #(
-  e) ac_cv_lib_intl_strftime=no ;;
-esac
+else $as_nop
+  ac_cv_lib_intl_strftime=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
 printf "%s\n" "$ac_cv_lib_intl_strftime" >&6; }
@@ -9954,8 +9649,7 @@
 
 LIBS="-lintl $LIBS"
 fi
- ;;
-esac
+
 fi
 
 done
@@ -9964,8 +9658,8 @@
 if test ${ac_cv_lib_error_at_line+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <error.h>
 int
@@ -9979,13 +9673,11 @@
 if ac_fn_cxx_try_link "$LINENO"
 then :
   ac_cv_lib_error_at_line=yes
-else case e in #(
-  e) ac_cv_lib_error_at_line=no ;;
-esac
+else $as_nop
+  ac_cv_lib_error_at_line=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+    conftest$ac_exeext conftest.$ac_ext
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
 printf "%s\n" "$ac_cv_lib_error_at_line" >&6; }
@@ -9998,101 +9690,76 @@
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for declarations of fseeko and ftello" >&5
-printf %s "checking for declarations of fseeko and ftello... " >&6; }
-if test ${ac_cv_func_fseeko_ftello+y}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if test ${ac_cv_sys_largefile_source+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#if defined __hpux && !defined _LARGEFILE_SOURCE
-# include <limits.h>
-# if LONG_MAX >> 31 == 0
-#  error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++"
-# endif
-#endif
 #include <sys/types.h> /* for off_t */
-#include <stdio.h>
-
+     #include <stdio.h>
 int
 main (void)
 {
-
-  int (*fp1) (FILE *, off_t, int) = fseeko;
-  off_t (*fp2) (FILE *) = ftello;
-  return fseeko (stdin, 0, 0)
-      && fp1 (stdin, 0, 0)
-      && ftello (stdin) >= 0
-      && fp2 (stdin) >= 0;
-
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
+if ac_fn_cxx_try_link "$LINENO"
 then :
-  ac_cv_func_fseeko_ftello=yes
-else case e in #(
-  e) ac_save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE=1"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_sys_largefile_source=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#if defined __hpux && !defined _LARGEFILE_SOURCE
-# include <limits.h>
-# if LONG_MAX >> 31 == 0
-#  error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++"
-# endif
-#endif
+#define _LARGEFILE_SOURCE 1
 #include <sys/types.h> /* for off_t */
-#include <stdio.h>
-
+     #include <stdio.h>
 int
 main (void)
 {
-
-  int (*fp1) (FILE *, off_t, int) = fseeko;
-  off_t (*fp2) (FILE *) = ftello;
-  return fseeko (stdin, 0, 0)
-      && fp1 (stdin, 0, 0)
-      && ftello (stdin) >= 0
-      && fp2 (stdin) >= 0;
-
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
+if ac_fn_cxx_try_link "$LINENO"
 then :
-  ac_cv_func_fseeko_ftello="need _LARGEFILE_SOURCE"
-else case e in #(
-  e) ac_cv_func_fseeko_ftello=no ;;
-esac
+  ac_cv_sys_largefile_source=1; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  ac_cv_sys_largefile_source=unknown
+  break
+done
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
+printf "%s\n" "$ac_cv_sys_largefile_source" >&6; }
+case $ac_cv_sys_largefile_source in #(
+  no | unknown) ;;
+  *)
+printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h
+;;
 esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fseeko_ftello" >&5
-printf "%s\n" "$ac_cv_func_fseeko_ftello" >&6; }
-if test "$ac_cv_func_fseeko_ftello" != no
-then :
+rm -rf conftest*
 
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+if test $ac_cv_sys_largefile_source != unknown; then
+
 printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h
 
 fi
-if test "$ac_cv_func_fseeko_ftello" = "need _LARGEFILE_SOURCE"
-then :
 
-printf "%s\n" "#define _LARGEFILE_SOURCE 1" >>confdefs.h
 
-fi
-
-
 ac_fn_cxx_check_func "$LINENO" "strptime" "ac_cv_func_strptime"
 if test "x$ac_cv_func_strptime" = xyes
 then :
@@ -10123,8 +9790,8 @@
 # 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
@@ -10154,7 +9821,7 @@
   (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;
@@ -10161,7 +9828,7 @@
 	  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 |
@@ -10252,6 +9919,7 @@
 
 # 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
@@ -10260,13 +9928,12 @@
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else case e in #(
-  e) case `(set -o) 2>/dev/null` in #(
+else $as_nop
+  case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
-esac ;;
 esac
 fi
 
@@ -10338,7 +10005,7 @@
 
      ;;
 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
@@ -10367,6 +10034,7 @@
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -10406,12 +10074,11 @@
   {
     eval $1+=\$2
   }'
-else case e in #(
-  e) as_fn_append ()
+else $as_nop
+  as_fn_append ()
   {
     eval $1=\$$1\$2
-  } ;;
-esac
+  }
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -10425,12 +10092,11 @@
   {
     as_val=$(( $* ))
   }'
-else case e in #(
-  e) as_fn_arith ()
+else $as_nop
+  as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  } ;;
-esac
+  }
 fi # as_fn_arith
 
 
@@ -10513,9 +10179,9 @@
   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
@@ -10596,12 +10262,10 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-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
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
@@ -10617,7 +10281,7 @@
 # values after options handling.
 ac_log="
 This file was extended by Asymptote $as_me 2.88, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -10648,7 +10312,7 @@
 
 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.
 
@@ -10681,10 +10345,10 @@
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 Asymptote config.status 2.88
-configured by $0, generated by GNU Autoconf 2.72,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -10744,8 +10408,8 @@
     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 \
@@ -10753,8 +10417,8 @@
     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 ;;
@@ -10807,7 +10471,7 @@
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/png/Makefile") CONFIG_FILES="$CONFIG_FILES doc/png/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -10826,7 +10490,7 @@
 # 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=
@@ -10850,7 +10514,7 @@
 
 # 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
 
 
@@ -11008,13 +10672,13 @@
 
 # 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.
 
@@ -11124,7 +10788,7 @@
   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
@@ -11146,19 +10810,19 @@
       -) 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 '`
@@ -11286,7 +10950,7 @@
 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
@@ -11316,9 +10980,9 @@
   { 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"
@@ -11394,22 +11058,21 @@
 
 
 if test "x$GCDIR" != "x" ; then
-   as_ac_File=`printf "%s\n" "ac_cv_file_$GCDIR.tar.gz" | sed "$as_sed_sh"`
+   as_ac_File=`printf "%s\n" "ac_cv_file_$GCDIR.tar.gz" | $as_tr_sh`
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $GCDIR.tar.gz" >&5
 printf %s "checking for $GCDIR.tar.gz... " >&6; }
 if eval test \${$as_ac_File+y}
 then :
   printf %s "(cached) " >&6
-else case e in #(
-  e) test "$cross_compiling" = yes &&
+else $as_nop
+  test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$GCDIR.tar.gz"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
-fi ;;
-esac
 fi
+fi
 eval ac_res=\$$as_ac_File
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 printf "%s\n" "$ac_res" >&6; }
@@ -11416,8 +11079,8 @@
 if eval test \"x\$"$as_ac_File"\" = x"yes"
 then :
 
-else case e in #(
-  e)
+else $as_nop
+
    echo
    echo Please put the Boehm garbage collector tar.gz files in the asymptote directory.
    echo FOR EXAMPLE, USE THE COMMANDS:
@@ -11427,8 +11090,7 @@
 
    echo
    exit 1
-    ;;
-esac
+
 fi
 
 fi

Modified: trunk/Build/source/utils/asymptote/configure.ac
===================================================================
--- trunk/Build/source/utils/asymptote/configure.ac	2024-03-10 17:07:26 UTC (rev 70551)
+++ trunk/Build/source/utils/asymptote/configure.ac	2024-03-10 17:59:37 UTC (rev 70552)
@@ -317,9 +317,11 @@
 AC_ARG_ENABLE(static,
 [AS_HELP_STRING(--enable-static[[[=no]]],link against static libraries)])
 
+LDSTATIC=""
 STATIC=""
 DYNAMIC=""
 if test "x$enable_static" = "xyes"; then
+  LDSTATIC="-static "
   STATIC="-Wl,-Bstatic "
   DYNAMIC="-Wl,-Bdynamic "
 fi
@@ -330,29 +332,31 @@
 AC_CHECK_HEADERS(editline/readline.h)
 ])
 
+AC_DEFUN([CHECK_FOUND_STATIC],[
+AC_DEFINE($1,1,DEFINE_LIB($2))
+LIBS=$LIBS$STATIC"-l$2 "$DYNAMIC
+])
+
 AC_DEFUN([AC_CHECK_LIB_STATIC],[
-PKGFLAGS=`pkg-config --silence-errors --libs $1`
-if test "x$PKGFLAGS" == "x"; then
-PKGFLAGS=-l"$2 "
-echo Will try linking with $PKGFLAGS
-fi
-LDFLAGS_SAVE=$LDFLAGS
-LDFLAGS="$LDFLAGS ""$STATIC ""$PKGFLAGS""$DYNAMIC "
-AC_CHECK_LIB($2,$3,AC_DEFINE($4,1,DEFINE_LIB($2)),
+LDFLAGS0=$LDFLAGS
+LDFLAGS=$LDFLAGS$LDSTATIC
+AC_CHECK_LIB($1,$2,CHECK_FOUND_STATIC($3,$1),
 if test "x$enable_static" = "xyes"; then
 [
-LDFLAGS="$LDFLAGS_SAVE ""$PKGFLAGS"
-AS_UNSET([ac_cv_lib_$2_$3])
-AC_CHECK_LIB($2,$3,,$5)
+AS_UNSET([ac_cv_lib_$1_$2])
+LDFLAGS=$LDFLAGS0
+AC_CHECK_LIB($1,$2,,$4)
 ]
 else
-$5
+$4
 fi
 )
+LDFLAGS=$LDFLAGS0
 ])
 
 if test "x$enable_readline" != "xno"; then
 CPPFLAGS="$CPPFLAGS "`pkg-config --cflags readline`
+LDFLAGS="$LDFLAGS "`pkg-config --libs readline`
 AC_COMPILE_IFELSE([
 AC_LANG_PROGRAM([
 #include <stdio.h>
@@ -363,16 +367,14 @@
 abort
 #endif
 ])],
-AC_CHECK_LIB_STATIC(readline,readline,history_list,HAVE_LIBREADLINE,READLINE),
+AC_CHECK_LIB_STATIC(readline,history_list,HAVE_LIBREADLINE,READLINE),
 READLINE)
 
-CPPFLAGS="$CPPFLAGS "`pkg-config --cflags tinfo`
-AC_CHECK_LIB_STATIC(tinfo,tinfo,tgetent,HAVE_LIBTINFO,AC_MSG_NOTICE([perhaps tgetent is in -lncurses]))
+AC_CHECK_LIB_STATIC(tinfo,tgetent,HAVE_LIBTINFO,AC_MSG_NOTICE([perhaps tgetent is in -lncurses]))
 
-CPPFLAGS="$CPPFLAGS "`pkg-config --cflags ncurses`
 AC_CHECK_HEADERS([ncurses/curses.h ncurses.h curses.h],[break])
-AC_CHECK_LIB_STATIC(ncurses,ncurses,setupterm,HAVE_LIBCURSES,
-                    AC_CHECK_LIB(curses,setupterm))
+AC_CHECK_LIB_STATIC([ncurses],[setupterm],HAVE_LIBCURSES,
+                    AC_CHECK_LIB([curses],[setupterm]))
 fi
 
 AC_ARG_ENABLE(fftw,
@@ -380,8 +382,9 @@
 
 if test "x$enable_fftw" != "xno"; then
 CPPFLAGS="$CPPFLAGS "`pkg-config --cflags fftw3`
+LDFLAGS="$LDFLAGS "`pkg-config --libs fftw3`
 AC_CHECK_HEADER(fftw3.h,
-AC_CHECK_LIB_STATIC(fftw3,fftw3,fftw_execute,HAVE_LIBFFTW3,
+AC_CHECK_LIB_STATIC([fftw3],[fftw_execute],HAVE_LIBFFTW3,
            AC_MSG_NOTICE([*** Could not find libfftw3: will compile without optional fast Fourier transforms. ***])),
      AC_MSG_NOTICE([*** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***]))
 fi
@@ -400,22 +403,20 @@
 AC_CHECK_HEADERS(fpu_control.h)
 AC_CHECK_FUNCS([feenableexcept])
 
-AC_ARG_ENABLE(xdr,
-[AS_HELP_STRING(--enable-xdr[[[=yes]]],enable XDR/V3D support)])
-if test "x$enable_xdr" != "xno"; then
 case "$OSTYPE" in
      darwin*)
      ;;
      *)
      CPPFLAGS="$CPPFLAGS "`pkg-config --cflags libtirpc`
+     LDFLAGS="$LDFLAGS "`pkg-config --libs libtirpc`
      ;;
 esac
 
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "xstream.h"])],
-                   AC_CHECK_LIB_STATIC(libtirpc,tirpc,xdrstdio_create,
-                    HAVE_LIBTIRPC,AC_MSG_NOTICE([*** Could not find libtirpc; XDR/V3D support disabled ***])),
-AC_MSG_NOTICE([*** Broken rpc headers; XDR/V3D support disabled ***]))
-fi
+                   [AC_SEARCH_LIBS([xdrstdio_create],[nsl tirpc])
+                    AC_DEFINE(HAVE_LIBTIRPC,1,
+                   DEFINE([a working <tirpc/rpc/rpc.h> header]))],
+   AC_MSG_WARN([*** Broken rpc headers; XDR/V3D support disabled ***]))
 
 AC_ARG_ENABLE(gsl,
 [AS_HELP_STRING(--enable-gsl[[[=yes]]],enable GNU Scientific Library)])
@@ -422,7 +423,7 @@
 
 if test "x$enable_gsl" != "xno"; then
   CPPFLAGS="$CPPFLAGS "`pkg-config --cflags gsl`
-  LDFLAGS="$LDFLAGS "`pkg-config --silence-errors --libs gsl`
+  LDFLAGS="$LDFLAGS "`pkg-config --libs gsl`
   AC_CHECK_HEADER(gsl/gsl_sf.h,
    AC_CHECK_LIB([gsl], gsl_sf_debye_6, [AC_DEFINE(HAVE_LIBGSL,1,
    DEFINE_LIB[gsl]) LIBS=$LIBS"-lgsl -lgslcblas "],

Modified: trunk/Master/tlpkg/bin/tl-update-asy
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-asy	2024-03-10 17:07:26 UTC (rev 70551)
+++ trunk/Master/tlpkg/bin/tl-update-asy	2024-03-10 17:59:37 UTC (rev 70552)
@@ -66,10 +66,10 @@
   fi
   rm -rf config.cache config.h config.log config.status errors.temp
   rm -rf /tmp/ainst autom4te.cache
-  ./configure --prefix=/tmp/ainst --disable-readline \
+  ./configure --prefix=/tmp/ainst --enable-static \
     --with-latex=/tmp/ainst/latex --with-context=/tmp/ainst/context \
     --disable-fftw --disable-gl --disable-gsl --disable-lsp \
-    --enable-texlive-build CFLAGS=-g CXXFLAGS=-std=c++17 #-ansi
+    --enable-texlive-build CFLAGS=-g CXXFLAGS=-std=c++11
   make
   make check
   make install-prebuilt



More information about the tex-live-commits mailing list.