From 51b5d09818c841115550baf5d52906053a77f267 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 14:33:32 -0500 Subject: [PATCH] Reset configure.ac back to main branch --- configure | 1063 +++++++++++++++++++++++--------------------------- configure.ac | 78 ++-- 2 files changed, 527 insertions(+), 614 deletions(-) diff --git a/configure b/configure index 132d7611f..4adc9c2ca 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72. +# Generated by GNU Autoconf 2.71. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, # Inc. # # @@ -15,6 +15,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 @@ -23,13 +24,12 @@ then : # 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 @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,14 +131,15 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="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=: @@ -146,13 +147,12 @@ then : # 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 " @@ -170,9 +170,8 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else 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)) @@ -185,15 +184,14 @@ test -x / || exit 1" 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 @@ -226,13 +224,12 @@ IFS=$as_save_IFS 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 @@ -254,7 +251,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -273,8 +270,7 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi ;; -esac +fi fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -313,6 +309,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -381,12 +385,11 @@ then : { 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... @@ -400,14 +403,21 @@ then : { 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] # ---------------------------------------- @@ -481,8 +491,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' - t clear - :clear s/[$]LINENO.*/&-/ t lineno b @@ -531,6 +539,7 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -542,9 +551,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -569,12 +578,10 @@ as_test_x='test -x' 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 && - 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 @@ -955,7 +964,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1168,7 +1177,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1184,7 +1193,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1214,8 +1223,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: '$ac_option' -Try '$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1223,7 +1232,7 @@ Try '$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1273,7 +1282,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: '$host' +# There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1341,7 +1350,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1369,7 +1378,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures this package to adapt to many kinds of systems. +\`configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,11 +1392,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print 'checking ...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for '--cache-file=config.cache' + -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or '..'] + --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1395,10 +1404,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, 'make install' will install all the files in -'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -an installation prefix other than '$ac_default_prefix' using '--prefix', -for instance '--prefix=\$HOME'. +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. For better control, use the options below. @@ -1537,7 +1546,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -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 the package provider. @@ -1605,9 +1614,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -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 @@ -1646,12 +1655,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && 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 @@ -1670,8 +1678,8 @@ printf %s "checking for $2... " >&6; } 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> @@ -1679,12 +1687,10 @@ _ACEOF 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 @@ -1724,12 +1730,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } 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 @@ -1765,7 +1770,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2011,10 +2016,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2050,7 +2055,9 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (char **p, int i) +static char *e (p, i) + char **p; + int i; { return p[i]; } @@ -2064,21 +2071,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } -/* C89 style stringification. */ -#define noexpand_stringify(a) #a -const char *stringified = noexpand_stringify(arbitrary+token=sequence); - -/* C89 style token pasting. Exercises some of the corner cases that - e.g. old MSVC gets wrong, but not very hard. */ -#define noexpand_concat(a,b) a##b -#define expand_concat(a,b) noexpand_concat(a,b) -extern int vA; -extern int vbee; -#define aye A -#define bee B -int *pvA = &expand_concat(v,aye); -int *pvbee = &noexpand_concat(v,bee); - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2106,19 +2098,16 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -/* Does the compiler advertise C99 conformance? */ +// Does the compiler advertise C99 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif -// See if C++-style comments work. - #include 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 @@ -2168,6 +2157,7 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { + // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2233,8 +2223,6 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; - // Work around memory leak warnings. - free (ia); // Check named initializers. struct named_init ni = { @@ -2256,7 +2244,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -/* Does the compiler advertise C11 conformance? */ +// Does the compiler advertise C11 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2379,12 +2367,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2393,18 +2381,18 @@ printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2420,11 +2408,11 @@ printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2462,8 +2450,8 @@ printf %s "checking for $ac_word... " >&6; } 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 @@ -2485,8 +2473,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2508,8 +2495,8 @@ printf %s "checking for $ac_word... " >&6; } 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 @@ -2531,8 +2518,7 @@ done 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 @@ -2567,8 +2553,8 @@ printf %s "checking for $ac_word... " >&6; } 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 @@ -2590,8 +2576,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2613,8 +2598,8 @@ printf %s "checking for $ac_word... " >&6; } 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 @@ -2653,8 +2638,7 @@ if test $ac_prog_rejected = yes; then 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 @@ -2678,8 +2662,8 @@ printf %s "checking for $ac_word... " >&6; } 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 @@ -2701,8 +2685,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2728,8 +2711,8 @@ printf %s "checking for $ac_word... " >&6; } 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 @@ -2751,8 +2734,7 @@ done 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 @@ -2790,8 +2772,8 @@ printf %s "checking for $ac_word... " >&6; } 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 @@ -2813,8 +2795,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2836,8 +2817,8 @@ printf %s "checking for $ac_word... " >&6; } 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 @@ -2859,8 +2840,7 @@ done 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 @@ -2889,10 +2869,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2964,8 +2944,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. -# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2985,7 +2965,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an '-o' + # safe: cross compilers may not add the suffix if given an `-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2996,9 +2976,8 @@ do 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 : @@ -3007,14 +2986,13 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See 'config.log' for more details" "$LINENO" 5; } -else 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; } @@ -3038,10 +3016,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) -# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will -# work properly (i.e., refer to 'conftest.exe'), while it won't with -# 'rm'. + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3051,12 +3029,11 @@ for ac_file in conftest.exe conftest conftest.*; do * ) 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 @@ -3072,8 +3049,6 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); - if (!f) - return 1; return ferror (f) || fclose (f) != 0; ; @@ -3113,27 +3088,26 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use '--host'. -See 'config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext \ - conftest.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; } 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 @@ -3165,18 +3139,16 @@ then : 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; } @@ -3187,8 +3159,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else 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 @@ -3205,14 +3177,12 @@ _ACEOF 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; } @@ -3230,8 +3200,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } 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" @@ -3249,8 +3219,8 @@ _ACEOF 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. */ @@ -3265,8 +3235,8 @@ _ACEOF 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. */ @@ -3283,15 +3253,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -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; } @@ -3318,8 +3285,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else 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. */ @@ -3336,28 +3303,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else 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 @@ -3367,8 +3331,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else 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. */ @@ -3385,28 +3349,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else 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 @@ -3416,8 +3377,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else 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. */ @@ -3434,28 +3395,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else 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 @@ -3515,14 +3473,13 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3537,14 +3494,13 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3557,14 +3513,13 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3577,14 +3532,13 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3599,14 +3553,13 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3621,14 +3574,13 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3643,14 +3595,13 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3665,14 +3616,13 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3687,14 +3637,13 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3708,14 +3657,13 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else case e in #( - e) withval="user_default" +else $as_nop + withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3728,14 +3676,13 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else case e in #( - e) withval="/etc/lmod" +else $as_nop + withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3750,14 +3697,13 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3774,14 +3720,13 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3796,14 +3741,13 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3815,14 +3759,13 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else case e in #( - e) withval="$prefix/modulefiles" +else $as_nop + withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3835,14 +3778,13 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else case e in #( - e) withval="86400" +else $as_nop + withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3855,14 +3797,13 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else case e in #( - e) withval="2" +else $as_nop + withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3875,14 +3816,13 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3895,14 +3835,13 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3915,14 +3854,13 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3935,14 +3873,13 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else case e in #( - e) withval="normal" +else $as_nop + withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3955,14 +3892,13 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3975,14 +3911,13 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3997,14 +3932,13 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4019,14 +3953,13 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4041,14 +3974,13 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4063,14 +3995,13 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - ;; -esac + fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4085,14 +4016,13 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else case e in #( - e) withval="$DFLT_IGNORE_DIRS" +else $as_nop + withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4107,14 +4037,13 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4129,14 +4058,13 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4151,14 +4079,13 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4173,14 +4100,13 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4195,14 +4121,13 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4215,14 +4140,13 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4237,14 +4161,13 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4259,14 +4182,13 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4281,14 +4203,13 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4301,14 +4222,13 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else case e in #( - e) withval="@PKG@/init/.modulespath" +else $as_nop + withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4323,14 +4243,13 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4345,14 +4264,13 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4367,14 +4285,13 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4389,14 +4306,13 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4411,14 +4327,13 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4433,14 +4348,13 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4455,14 +4369,13 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4473,20 +4386,19 @@ then : withval=$with_lua; PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then echo "Path to lua must be absolute" - FOUND_ERROR=yes + exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$with_lua" >&5 printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else case e in #( - e) withval="lua" +else $as_nop + withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4497,20 +4409,19 @@ then : withval=$with_luac; PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then echo "Path to luac must be absolute" - FOUND_ERROR=yes + exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$with_luac" >&5 printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else case e in #( - e) withval="luac" +else $as_nop + withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4525,22 +4436,19 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - ;; -esac + fi if test "$ALLOW_TCL_MFILES" = no ; then FAST_TCL_INTERP=no fi -FOUND_ERROR= - if test "$FAST_TCL_INTERP" = yes ; then OS=$(uname -s) if test "$OS" = Darwin ; then @@ -4563,8 +4471,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4590,7 +4498,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4658,30 +4565,22 @@ fi if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - FOUND_ERROR=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" >&5 -printf "%s\n" "$as_me: Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" >&6;} + as_fn_error $? "Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" "$LINENO" 5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_CreateInterp" >&5 printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - 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 Tcl_CreateInterp (void); + builtin and then its argument prototype would still apply. */ +char Tcl_CreateInterp (); int main (void) { @@ -4712,13 +4611,11 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else case e in #( - e) ac_cv_search_Tcl_CreateInterp=no ;; -esac +else $as_nop + ac_cv_search_Tcl_CreateInterp=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4727,10 +4624,8 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else case e in #( - e) rm -f makefile; FOUND_ERROR=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&5 -printf "%s\n" "$as_me: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&6;} ;; -esac +else $as_nop + rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 fi @@ -4772,7 +4667,7 @@ if test $MODE != "user_default" ; then echo "Please try setting mode to 755 or 750 or 700 or similar." echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi @@ -4784,8 +4679,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PS in +else $as_nop + case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4811,7 +4706,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; -esac ;; esac fi PS=$ac_cv_path_PS @@ -4829,7 +4723,7 @@ if test "$PS" = "UNKNOWN_PS" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi # Extract the first word of "readlink", so it can be a program name with args. @@ -4839,8 +4733,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $READLINK in +else $as_nop + case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4866,7 +4760,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; -esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4884,7 +4777,7 @@ if test "$READLINK" = "UNKNOWN_READLINK" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi for ac_prog in gexpr expr @@ -4896,8 +4789,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $EXPR in +else $as_nop + case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4922,7 +4815,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4944,7 +4836,7 @@ if test "$EXPR" = "UNKNOWN_EXPR" ; then echo "You must have valid expr or gexpr in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi for ac_prog in gbasename basename @@ -4956,8 +4848,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BASENAME in +else $as_nop + case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4982,7 +4874,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -5004,7 +4895,7 @@ if test "$BASENAME" = "UNKNOWN_BASENAME" ; then echo "You must have either basename or gbasename in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi for ac_prog in bc @@ -5016,8 +4907,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BC in +else $as_nop + case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -5042,7 +4933,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BC=$ac_cv_path_BC @@ -5064,7 +4954,7 @@ if test "$BC" = "UNKNOWN_BC" ; then echo "You must have bc in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi # Extract the first word of "pod2man", so it can be a program name with args. @@ -5074,8 +4964,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_POD2MAN in +else $as_nop + case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -5101,7 +4991,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; -esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5122,8 +5011,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_GIT in +else $as_nop + case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5149,7 +5038,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; -esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5171,8 +5059,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_PAGER in +else $as_nop + case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5197,7 +5085,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5224,8 +5111,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_HASHSUM in +else $as_nop + case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5250,7 +5137,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5274,7 +5160,7 @@ elif test "$PATH_TO_HASHSUM" = "UNKNOWN_HASHSUM" ; then echo "You must have either sha1sum, shasum, md5sum or md5 in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi # Extract the first word of "tclsh", so it can be a program name with args. @@ -5284,8 +5170,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TCLSH in +else $as_nop + case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5311,7 +5197,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; -esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5329,7 +5214,7 @@ if test "$PATH_TO_TCLSH" = "UNKNOWN_TCLSH" -a "$ALLOW_TCL_MFILES" = yes; then echo "The tclsh program must be in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi for ac_prog in gtr tr do @@ -5340,8 +5225,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TR in +else $as_nop + case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5366,7 +5251,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5392,8 +5276,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_LS in +else $as_nop + case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5418,7 +5302,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5443,14 +5326,14 @@ test -n "$PATH_TO_LS" || PATH_TO_LS="""" if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test "${LUA_SUFFIX}" != no ; then if test "${PATH_TO_LUA:0:1}" = '/' -o "${PATH_TO_LUAC:0:1}" = '/'; then echo "Neither --with-lua= nor --with-luac= can be used with --with-luaSuffix=" rm -f makefile - FOUND_ERROR=yes + exit 1 fi PATH_TO_LUA=lua$LUA_SUFFIX PATH_TO_LUAC=luac$LUA_SUFFIX @@ -5466,14 +5349,14 @@ else if test "$mismatch" = true ; then echo "Both --with-lua= and --with-luac= must both be specified" rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test ${PATH_TO_LUA:0:1} != '/' ; then @@ -5484,8 +5367,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUA in +else $as_nop + case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5510,7 +5393,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5529,7 +5411,7 @@ fi if ! command -v $PATH_TO_LUAC &>/dev/null ; then echo 'The program "'$PATH_TO_LUAC'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test "${PATH_TO_LUAC:0:1}" != '/' ; then @@ -5540,8 +5422,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUAC in +else $as_nop + case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5566,7 +5448,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5599,7 +5480,7 @@ IntLuaV=$( $PATH_TO_LUA -e "_,_,M,m=_VERSION:gsub('Lua%s+',''):find('(%d+)%.(%d if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5004; then echo "Error: Lmod requires versions 5.1, 5.2, 5.3, or 5.4 You have: $LuaV" rm -f makefile - FOUND_ERROR=yes + exit 1 fi echo "... $LuaV" @@ -5640,7 +5521,7 @@ if test -n "$missingModules" ; then echo "" echo "You can not run Lmod without: $missingModules" rm -f makefile - FOUND_ERROR=yes + exit 1 else echo "... yes" fi @@ -5713,8 +5594,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5740,7 +5621,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5781,21 +5661,13 @@ if ! test "$HAVE_LUA_TERM" = yes; then echo Quitting! echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then - echo - echo One or more errors found -> Quiting! - echo - rm -f makefile - exit 1; -fi - # Extract the first word of "zsh", so it can be a program name with args. set dummy zsh; ac_word=$2 @@ -5804,8 +5676,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $ZSH in +else $as_nop + case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5830,7 +5702,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5875,6 +5746,33 @@ EOF rm conftest.zsh fi + +if test -n "$PATH_TO_ZSH" ; then + cat > conftest.zsh << 'EOF' +echo $ZSH_VERSION +EOF + chmod +x conftest.zsh + ORIG_ZSH_VERSION=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` + rm conftest.zsh +fi + + + +if test -n "$PATH_TO_ZSH" ; then + cat > conftest.zsh << 'EOF' +echo $FPATH +EOF + + chmod +x conftest.zsh + + unset FPATH + ZSH_FPATH=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` + + rm conftest.zsh +fi + + + ac_config_files="$ac_config_files makefile:Makefile.in" cat >confcache <<\_ACEOF @@ -5887,8 +5785,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# 'ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* 'ac_cv_foo' will be assigned the +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5918,14 +5816,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # 'set' does not quote correctly, so add quotes: double-quote + # `set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # 'set' quotes correctly as required by POSIX, so do not add quotes. + # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -5989,7 +5887,9 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g s/\$/$$/g H :any @@ -6049,6 +5949,7 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -6057,13 +5958,12 @@ then : # 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 @@ -6135,7 +6035,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6164,6 +6064,7 @@ as_fn_error () } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6203,12 +6104,11 @@ then : { 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... @@ -6222,12 +6122,11 @@ then : { 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 @@ -6310,9 +6209,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6393,12 +6292,10 @@ as_test_x='test -x' 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 @@ -6414,7 +6311,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6441,7 +6338,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -'$as_me' instantiates files and other configuration actions +\`$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6469,10 +6366,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -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." @@ -6529,8 +6426,8 @@ do 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 ;; @@ -6580,7 +6477,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -6598,7 +6495,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to '$tmp'. +# after its creation but before its name has been assigned to `$tmp'. $debug || { tmp= ac_tmp= @@ -6622,7 +6519,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with './config.status config.h'. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6788,7 +6685,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6810,19 +6707,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain ':'. + # because $ac_f cannot contain `:'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is 'configure' which instantiates (i.e., don't + # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6946,7 +6843,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when '$srcdir' = '.'. +# Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -6975,9 +6872,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index cfe0a3ed5..e55bf3682 100644 --- a/configure.ac +++ b/configure.ac @@ -652,7 +652,7 @@ AC_ARG_WITH(lua, PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then echo "Path to lua must be absolute" - FOUND_ERROR=yes + exit 1 fi AC_MSG_RESULT([PATH_TO_LUA=$with_lua]) AC_DEFINE_UNQUOTED(PATH_TO_LUA, "$with_lua")dnl @@ -668,7 +668,7 @@ AC_ARG_WITH(luac, PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then echo "Path to luac must be absolute" - FOUND_ERROR=yes + exit 1 fi AC_MSG_RESULT([PATH_TO_LUAC=$with_luac]) AC_DEFINE_UNQUOTED(PATH_TO_LUAC, "$with_luac")dnl @@ -696,8 +696,6 @@ if test "$ALLOW_TCL_MFILES" = no ; then FAST_TCL_INTERP=no fi -FOUND_ERROR= - if test "$FAST_TCL_INTERP" = yes ; then OS=$(uname -s) if test "$OS" = Darwin ; then @@ -733,11 +731,10 @@ if test "$FAST_TCL_INTERP" = yes ; then if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - FOUND_ERROR=yes - AC_MSG_NOTICE([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) + AC_MSG_ERROR([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) fi AC_SEARCH_LIBS(Tcl_CreateInterp, [tcl] [tcl8.8] [tcl8.7] [tcl8.6] [tcl8.5],[], - [rm -f makefile; FOUND_ERROR=yes; AC_MSG_NOTICE([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) + [rm -f makefile; AC_MSG_ERROR([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) AC_SUBST(TCL_INCLUDE, "$TCL_INCLUDE") AC_SUBST(TCL_LIBS, "$TCL_LIBS") @@ -775,7 +772,7 @@ if test $MODE != "user_default" ; then echo "Please try setting mode to 755 or 750 or 700 or similar." echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi @@ -786,7 +783,7 @@ if test "$PS" = "UNKNOWN_PS" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROG(READLINK,readlink, UNKNOWN_READLINK) @@ -795,7 +792,7 @@ if test "$READLINK" = "UNKNOWN_READLINK" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROGS(EXPR,[gexpr] [expr], UNKNOWN_EXPR) @@ -804,7 +801,7 @@ if test "$EXPR" = "UNKNOWN_EXPR" ; then echo "You must have valid expr or gexpr in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROGS(BASENAME, [gbasename] [basename], UNKNOWN_BASENAME) @@ -813,7 +810,7 @@ if test "$BASENAME" = "UNKNOWN_BASENAME" ; then echo "You must have either basename or gbasename in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROGS(BC, [bc], UNKNOWN_BC) @@ -822,7 +819,7 @@ if test "$BC" = "UNKNOWN_BC" ; then echo "You must have bc in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROG(PATH_TO_POD2MAN, pod2man, UNKNOWN_POD2MAN) @@ -838,7 +835,7 @@ elif test "$PATH_TO_HASHSUM" = "UNKNOWN_HASHSUM" ; then echo "You must have either sha1sum, shasum, md5sum or md5 in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROG(PATH_TO_TCLSH, tclsh, UNKNOWN_TCLSH) @@ -847,7 +844,7 @@ if test "$PATH_TO_TCLSH" = "UNKNOWN_TCLSH" -a "$ALLOW_TCL_MFILES" = yes; then echo "The tclsh program must be in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROGS(PATH_TO_TR, [gtr] [tr],"") AC_PATH_PROGS(PATH_TO_LS, [gls] [ls], "") @@ -859,14 +856,14 @@ AC_PATH_PROGS(PATH_TO_LS, [gls] [ls], "") if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test "${LUA_SUFFIX}" != no ; then if test "${PATH_TO_LUA:0:1}" = '/' -o "${PATH_TO_LUAC:0:1}" = '/'; then echo "Neither --with-lua= nor --with-luac= can be used with --with-luaSuffix=" rm -f makefile - FOUND_ERROR=yes + exit 1 fi PATH_TO_LUA=lua$LUA_SUFFIX PATH_TO_LUAC=luac$LUA_SUFFIX @@ -882,14 +879,14 @@ else if test "$mismatch" = true ; then echo "Both --with-lua= and --with-luac= must both be specified" rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test ${PATH_TO_LUA:0:1} != '/' ; then @@ -900,7 +897,7 @@ fi if ! command -v $PATH_TO_LUAC &>/dev/null ; then echo 'The program "'$PATH_TO_LUAC'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test "${PATH_TO_LUAC:0:1}" != '/' ; then @@ -925,7 +922,7 @@ IntLuaV=$( $PATH_TO_LUA -e "_,_,M,m=_VERSION:gsub('Lua%s+',''):find('(%d+)%.(%d if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5004; then echo "Error: Lmod requires versions 5.1, 5.2, 5.3, or 5.4 You have: $LuaV" rm -f makefile - FOUND_ERROR=yes + exit 1 fi echo "... $LuaV" @@ -966,7 +963,7 @@ if test -n "$missingModules" ; then echo "" echo "You can not run Lmod without: $missingModules" rm -f makefile - FOUND_ERROR=yes + exit 1 else echo "... yes" fi @@ -1057,21 +1054,13 @@ if ! test "$HAVE_LUA_TERM" = yes; then echo Quitting! echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then - echo - echo One or more errors found -> Quiting! - echo - rm -f makefile - exit 1; -fi - AC_SUBST(ZSH_SITE_FUNCTIONS_DIRS) AC_PATH_PROG(ZSH, zsh) PATH_TO_ZSH=$ZSH @@ -1106,6 +1095,33 @@ EOF rm conftest.zsh fi +AC_SUBST(ORIG_ZSH_VERSION) +if test -n "$PATH_TO_ZSH" ; then + cat > conftest.zsh << 'EOF' +echo $ZSH_VERSION +EOF + chmod +x conftest.zsh + ORIG_ZSH_VERSION=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` + rm conftest.zsh +fi + + +AC_SUBST(ZSH_FPATH) +if test -n "$PATH_TO_ZSH" ; then + cat > conftest.zsh << 'EOF' +echo $FPATH +EOF + + chmod +x conftest.zsh + + unset FPATH + ZSH_FPATH=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` + + rm conftest.zsh +fi + + + AC_CONFIG_FILES([makefile:Makefile.in]) AC_OUTPUT