From: Bruno Haible Date: Wed, 17 Jan 2024 20:53:15 +0000 (+0100) Subject: Improve naming of local variables. X-Git-Tag: v1.0~515 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d0450ae97e9fa3f2cf7ef45f990326b9f73b8081;p=gnulib.git Improve naming of local variables. * gnulib-tool, posix-modules, build-aux/relocatable.sh.in, build-aux/reloc-ldflags, build-aux/install-reloc, tests/init.sh, m4/argz.m4: Rename save_IFS to saved_IFS. * m4/*.m4: Rename save_LIBS to saved_LIBS. * m4/00gnulib.m4, m4/gnulib-common.m4, m4/warn-on-use.m4, m4/wchar_h.m4: Rename save_ac_compile to saved_ac_compile. * m4/00gnulib.m4: Rename ac_save_ac_compile to ac_saved_ac_compile. * m4/gnulib-common.m4: Rename save_ac_compile_for_check_decl to saved_ac_compile_for_check_decl. * m4/assert_h.m4, m4/manywarnings.m4, m4/stdalign.m4, m4/visibility.m4: Rename gl_save_CFLAGS to gl_saved_CFLAGS. * m4/dirfd.m4: Rename dirfd_save_CFLAGS to gl_saved_CFLAGS. * m4/include_next.m4, m4/pread.m4, m4/pwrite.m4, m4/termcap.m4, m4/terminfo.m4: Rename gl_save_CPPFLAGS to gl_saved_CPPFLAGS. * m4/lib-link.m4: Rename ac_save_CPPFLAGS to acl_save_CPPFLAGS. * m4/iconv.m4, m4/readline.m4: Rename am_save_CPPFLAGS to gl_saved_CPPFLAGS. * m4/gettext.m4: Rename gt_save_CPPFLAGS to gt_saved_CPPFLAGS. * m4/ansi-c++.m4: Rename gl_save_CXX to gl_saved_CXX. * m4/manywarnings-c++.m4: Rename gl_save_CXXFLAGS to gl_saved_CXXFLAGS. * m4/lib-link.m4: Rename acl_save_ifs to acl_saved_IFS. * m4/lib-prefix.m4: Rename acl_save_IFS to acl_saved_IFS. * m4/progtest.m4: Rename ac_save_IFS to gt_saved_IFS. * m4/lib-link.m4: Rename save_libdir to saved_libdir, acl_save_libdir to acl_saved_libdir. * m4/ld-version-script.m4: Rename save_LDFLAGS to saved_LDFLAGS. * m4/acl.m4, m4/getgroups.m4: Rename ac_save_LIBS to gl_saved_LIBS. * m4/lib-link.m4: Rename ac_save_LIBS to acl_saved_LIBS. * m4/getdomainname.m4, m4/gethostname.m4, m4/getloadavg.m4, m4/hostent.m4, m4/inet_ntop.m4, m4/inet_pton.m4, m4/pthread_mutex_timedlock.m4, m4/pthread_sigmask.m4, m4/pthread-spin.m4, m4/readutmp.m4, m4/selinux-selinux-h.m4, m4/servent.m4, m4/socketlib.m4, m4/termcap.m4, m4/terminfo.m4, m4/thread.m4: Rename gl_save_LIBS to gl_saved_LIBS. * m4/getaddrinfo.m4, m4/iconv.m4, m4/readline.m4: Rename am_save_LIBS to gl_saved_LIBS. * m4/gettext.m4, m4/intlmacosx.m4: Rename gt_save_LIBS to gt_saved_LIBS. * m4/libunistring.m4: Rename glus_save_LIBS to glus_saved_LIBS. * m4/nanosleep.m4: Rename nanosleep_save_libs to gl_saved_LIBS. * m4/lib-prefix.m4: Rename acl_save_prefix to acl_saved_prefix, acl_save_exec_prefix to acl_saved_exec_prefix. * m4/configmake.m4: Rename gl_save_ to gl_saved_. * m4/terminfo.m4: Likewise. * m4/gettext.m4: Rename gt_save_ to gt_saved_. * m4/javaexec.m4: Rename save_CLASSPATH to gt_saved_CLASSPATH. * m4/warnings.m4: Rename gl_save_compiler_FLAGS to gl_saved_compiler_FLAGS. * lib/pread.c, lib/pwrite.c, lib/read-file.c, lib/tempname.c: Rename save_errno to saved_errno. * lib/read-file.c: Rename save_alloc to saved_alloc. * lib/strptime.c: Rename save_wday to saved_wday, save_mday to saved_mday, save_mon to saved_mon. --- diff --git a/ChangeLog b/ChangeLog index 8551538ee8..3b86638ea3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,59 @@ +2024-01-17 Bruno Haible + + Improve naming of local variables. + * gnulib-tool, posix-modules, build-aux/relocatable.sh.in, + build-aux/reloc-ldflags, build-aux/install-reloc, tests/init.sh, + m4/argz.m4: Rename save_IFS to saved_IFS. + * m4/*.m4: Rename save_LIBS to saved_LIBS. + * m4/00gnulib.m4, m4/gnulib-common.m4, m4/warn-on-use.m4, m4/wchar_h.m4: + Rename save_ac_compile to saved_ac_compile. + * m4/00gnulib.m4: Rename ac_save_ac_compile to ac_saved_ac_compile. + * m4/gnulib-common.m4: Rename save_ac_compile_for_check_decl to + saved_ac_compile_for_check_decl. + * m4/assert_h.m4, m4/manywarnings.m4, m4/stdalign.m4, m4/visibility.m4: + Rename gl_save_CFLAGS to gl_saved_CFLAGS. + * m4/dirfd.m4: Rename dirfd_save_CFLAGS to gl_saved_CFLAGS. + * m4/include_next.m4, m4/pread.m4, m4/pwrite.m4, m4/termcap.m4, + m4/terminfo.m4: Rename gl_save_CPPFLAGS to gl_saved_CPPFLAGS. + * m4/lib-link.m4: Rename ac_save_CPPFLAGS to acl_save_CPPFLAGS. + * m4/iconv.m4, m4/readline.m4: Rename am_save_CPPFLAGS to + gl_saved_CPPFLAGS. + * m4/gettext.m4: Rename gt_save_CPPFLAGS to gt_saved_CPPFLAGS. + * m4/ansi-c++.m4: Rename gl_save_CXX to gl_saved_CXX. + * m4/manywarnings-c++.m4: Rename gl_save_CXXFLAGS to gl_saved_CXXFLAGS. + * m4/lib-link.m4: Rename acl_save_ifs to acl_saved_IFS. + * m4/lib-prefix.m4: Rename acl_save_IFS to acl_saved_IFS. + * m4/progtest.m4: Rename ac_save_IFS to gt_saved_IFS. + * m4/lib-link.m4: Rename save_libdir to saved_libdir, acl_save_libdir to + acl_saved_libdir. + * m4/ld-version-script.m4: Rename save_LDFLAGS to saved_LDFLAGS. + * m4/acl.m4, m4/getgroups.m4: Rename ac_save_LIBS to gl_saved_LIBS. + * m4/lib-link.m4: Rename ac_save_LIBS to acl_saved_LIBS. + * m4/getdomainname.m4, m4/gethostname.m4, m4/getloadavg.m4, + m4/hostent.m4, m4/inet_ntop.m4, m4/inet_pton.m4, + m4/pthread_mutex_timedlock.m4, m4/pthread_sigmask.m4, + m4/pthread-spin.m4, m4/readutmp.m4, m4/selinux-selinux-h.m4, + m4/servent.m4, m4/socketlib.m4, m4/termcap.m4, m4/terminfo.m4, + m4/thread.m4: Rename gl_save_LIBS to gl_saved_LIBS. + * m4/getaddrinfo.m4, m4/iconv.m4, m4/readline.m4: Rename am_save_LIBS to + gl_saved_LIBS. + * m4/gettext.m4, m4/intlmacosx.m4: Rename gt_save_LIBS to gt_saved_LIBS. + * m4/libunistring.m4: Rename glus_save_LIBS to glus_saved_LIBS. + * m4/nanosleep.m4: Rename nanosleep_save_libs to gl_saved_LIBS. + * m4/lib-prefix.m4: Rename acl_save_prefix to acl_saved_prefix, + acl_save_exec_prefix to acl_saved_exec_prefix. + * m4/configmake.m4: Rename gl_save_ to gl_saved_. + * m4/terminfo.m4: Likewise. + * m4/gettext.m4: Rename gt_save_ to gt_saved_. + * m4/javaexec.m4: Rename save_CLASSPATH to gt_saved_CLASSPATH. + * m4/warnings.m4: Rename gl_save_compiler_FLAGS to + gl_saved_compiler_FLAGS. + * lib/pread.c, lib/pwrite.c, lib/read-file.c, lib/tempname.c: Rename + save_errno to saved_errno. + * lib/read-file.c: Rename save_alloc to saved_alloc. + * lib/strptime.c: Rename save_wday to saved_wday, save_mday to + saved_mday, save_mon to saved_mon. + 2024-01-16 Paul Eggert posixtm: pacify clang 18 diff --git a/build-aux/install-reloc b/build-aux/install-reloc index 10eaabf4e0..6a4c9faa2d 100755 --- a/build-aux/install-reloc +++ b/build-aux/install-reloc @@ -186,9 +186,9 @@ fi test -n "$library_path_var" || exit 0 libdirs= -save_IFS="$IFS"; IFS=":" +saved_IFS="$IFS"; IFS=":" for dir in $library_path_value; do - IFS="$save_IFS" + IFS="$saved_IFS" if test -n "$dir"; then case "$libdirs" in *"\"$dir\""*) ;; # remove duplicate @@ -196,7 +196,7 @@ for dir in $library_path_value; do esac fi done -IFS="$save_IFS" +IFS="$saved_IFS" # If there are no library directories to add at runtime, we don't need a # wrapper. test -n "$libdirs" || exit 0 diff --git a/build-aux/reloc-ldflags b/build-aux/reloc-ldflags index 2c7a495876..f6b636624f 100755 --- a/build-aux/reloc-ldflags +++ b/build-aux/reloc-ldflags @@ -71,9 +71,9 @@ if test -n "$origin_token"; then # We are not on AIX, HP-UX, or IRIX. Therefore the -rpath options are # cumulative. rpath_options= - save_IFS="$IFS"; IFS=":" + saved_IFS="$IFS"; IFS=":" for dir in $library_path_value; do - IFS="$save_IFS" + IFS="$saved_IFS" case "$dir" in /*) # Make dir relative to installdir. (Works only if dir is absolute.) @@ -101,7 +101,7 @@ if test -n "$origin_token"; then ;; esac done - IFS="$save_IFS" + IFS="$saved_IFS" # Output it. if test -n "$rpath_options"; then case "$host_os" in diff --git a/build-aux/relocatable.sh.in b/build-aux/relocatable.sh.in index 19bba7e27f..cce37a1297 100644 --- a/build-aux/relocatable.sh.in +++ b/build-aux/relocatable.sh.in @@ -40,9 +40,9 @@ func_find_curr_installdir () || PATH_SEPARATOR=';' } fi - save_IFS="$IFS"; IFS="$PATH_SEPARATOR" + saved_IFS="$IFS"; IFS="$PATH_SEPARATOR" for dir in $PATH; do - IFS="$save_IFS" + IFS="$saved_IFS" test -z "$dir" && dir=. for exec_ext in ''; do if test -f "$dir/$curr_executable$exec_ext"; then @@ -51,7 +51,7 @@ func_find_curr_installdir () fi done done - IFS="$save_IFS" + IFS="$saved_IFS" ;; esac # Make absolute. diff --git a/gnulib-tool b/gnulib-tool index 9facfd2be7..029a8cf377 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -463,17 +463,17 @@ func_gnulib_dir () ;; esac fi - save_IFS="$IFS" + saved_IFS="$IFS" IFS="$PATH_SEPARATOR" for d in $pathx; do - IFS="$save_IFS" + IFS="$saved_IFS" test -z "$d" && d=. if test -x "$d/$progname" && test ! -d "$d/$progname"; then self_abspathname="$d/$progname" break fi done - IFS="$save_IFS" + IFS="$saved_IFS" if test -z "$self_abspathname"; then func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?" fi @@ -633,14 +633,14 @@ func_path_foreach () fpf_cb="$1"; shift fpf_rc=false - fpf_save_IFS="$IFS" + fpf_saved_IFS="$IFS" IFS="$PATH_SEPARATOR" for fpf_dir in $fpf_dirs do - IFS="$fpf_save_IFS" + IFS="$fpf_saved_IFS" func_path_foreach_inner "$@" && fpf_rc=: done - IFS="$fpf_save_IFS" + IFS="$fpf_saved_IFS" $fpf_rc } @@ -1682,17 +1682,17 @@ func_determine_path_separator sed_trimtrailingslashes='s,\([^/]\)//*$,\1,' old_local_gnulib_path="$local_gnulib_path" local_gnulib_path= - save_IFS="$IFS" + saved_IFS="$IFS" IFS=: for dir in $old_local_gnulib_path do - IFS="$save_IFS" + IFS="$saved_IFS" case "$dir" in */ ) dir=`echo "$dir" | sed -e "$sed_trimtrailingslashes"` ;; esac func_path_append local_gnulib_path "$dir" done - IFS="$save_IFS" + IFS="$saved_IFS" case "$sourcebase" in */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;; esac @@ -1799,14 +1799,14 @@ func_lookup_file () rm -f "$tmp/$lkbase" cp "$lookedup_file" "$tmp/$lkbase" func_ensure_writable "$tmp/$lkbase" - save_IFS="$IFS" + saved_IFS="$IFS" IFS="$PATH_SEPARATOR" for patchfile in $lkpatches; do - IFS="$save_IFS" + IFS="$saved_IFS" patch -s "$tmp/$lkbase" < "$patchfile" >&2 \ || func_fatal_error "patch file $patchfile didn't apply cleanly" done - IFS="$save_IFS" + IFS="$saved_IFS" lookedup_file="$tmp/$lkbase" lookedup_tmp=true fi @@ -5859,11 +5859,11 @@ s,//*$,/,' func_compute_relative_local_gnulib_path () { relative_local_gnulib_path= - save_IFS="$IFS" + saved_IFS="$IFS" IFS="$PATH_SEPARATOR" for local_dir in $local_gnulib_path do - IFS="$save_IFS" + IFS="$saved_IFS" # Store the local_dir relative to destdir. case "$local_dir" in "" | /*) @@ -5881,7 +5881,7 @@ s,//*$,/,' esac func_path_append relative_local_gnulib_path "$relative_local_dir" done - IFS="$save_IFS" + IFS="$saved_IFS" } # Create m4/gnulib-cache.m4. diff --git a/lib/pread.c b/lib/pread.c index 942541f81b..259678b30d 100644 --- a/lib/pread.c +++ b/lib/pread.c @@ -36,7 +36,7 @@ pread (int fd, void *buf, size_t nbyte, off_t offset) { /* Since we must not change the file pointer preserve the value so that we can restore it later. */ - int save_errno; + int saved_errno; ssize_t result; off_t old_offset = __libc_lseek (fd, 0, SEEK_CUR); if (old_offset == (off_t) -1) @@ -52,14 +52,14 @@ pread (int fd, void *buf, size_t nbyte, off_t offset) /* Now we have to restore the position. If this fails we have to return this as an error. But if the writing also failed we return this error. */ - save_errno = errno; + saved_errno = errno; if (__libc_lseek (fd, old_offset, SEEK_SET) == (off_t) -1) { if (result == -1) - __set_errno (save_errno); + __set_errno (saved_errno); return -1; } - __set_errno (save_errno); + __set_errno (saved_errno); return result; } diff --git a/lib/pwrite.c b/lib/pwrite.c index 940c7f7eb8..e9c3fdac24 100644 --- a/lib/pwrite.c +++ b/lib/pwrite.c @@ -35,7 +35,7 @@ pwrite (int fd, const void *buf, size_t nbyte, off_t offset) { /* Since we must not change the file pointer preserve the value so that we can restore it later. */ - int save_errno; + int saved_errno; ssize_t result; off_t old_offset = __libc_lseek (fd, 0, SEEK_CUR); if (old_offset == (off_t) -1) @@ -51,14 +51,14 @@ pwrite (int fd, const void *buf, size_t nbyte, off_t offset) /* Now we have to restore the position. If this fails we have to return this as an error. But if the writing also failed we return this error. */ - save_errno = errno; + saved_errno = errno; if (__libc_lseek (fd, old_offset, SEEK_SET) == (off_t) -1) { if (result == -1) - __set_errno (save_errno); + __set_errno (saved_errno); return -1; } - __set_errno (save_errno); + __set_errno (saved_errno); return result; } diff --git a/lib/read-file.c b/lib/read-file.c index c4aa093e1c..af6e083c97 100644 --- a/lib/read-file.c +++ b/lib/read-file.c @@ -84,7 +84,7 @@ fread_file (FILE *stream, int flags, size_t *length) { size_t size = 0; /* number of bytes read so far */ - int save_errno; + int saved_errno; for (;;) { @@ -96,7 +96,7 @@ fread_file (FILE *stream, int flags, size_t *length) if (count != requested) { - save_errno = errno; + saved_errno = errno; if (ferror (stream)) break; @@ -131,11 +131,11 @@ fread_file (FILE *stream, int flags, size_t *length) { char *new_buf; - size_t save_alloc = alloc; + size_t saved_alloc = alloc; if (alloc == PTRDIFF_MAX) { - save_errno = ENOMEM; + saved_errno = ENOMEM; break; } @@ -150,16 +150,16 @@ fread_file (FILE *stream, int flags, size_t *length) if (!new_buf) { /* BUF should be cleared below after the loop. */ - save_errno = errno; + saved_errno = errno; break; } - memcpy (new_buf, buf, save_alloc); - memset_explicit (buf, 0, save_alloc); + memcpy (new_buf, buf, saved_alloc); + memset_explicit (buf, 0, saved_alloc); free (buf); } else if (!(new_buf = realloc (buf, alloc))) { - save_errno = errno; + saved_errno = errno; break; } @@ -171,7 +171,7 @@ fread_file (FILE *stream, int flags, size_t *length) memset_explicit (buf, 0, alloc); free (buf); - errno = save_errno; + errno = saved_errno; return NULL; } } diff --git a/lib/strptime.c b/lib/strptime.c index 3039a47718..568caf6df8 100644 --- a/lib/strptime.c +++ b/lib/strptime.c @@ -1102,23 +1102,23 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) if ((have_uweek || have_wweek) && have_wday) { - int save_wday = tm->tm_wday; - int save_mday = tm->tm_mday; - int save_mon = tm->tm_mon; + int saved_wday = tm->tm_wday; + int saved_mday = tm->tm_mday; + int saved_mon = tm->tm_mon; int w_offset = have_uweek ? 0 : 1; tm->tm_mday = 1; tm->tm_mon = 0; day_of_the_week (tm); if (have_mday) - tm->tm_mday = save_mday; + tm->tm_mday = saved_mday; if (have_mon) - tm->tm_mon = save_mon; + tm->tm_mon = saved_mon; if (!have_yday) tm->tm_yday = ((7 - (tm->tm_wday - w_offset)) % 7 + (week_no - 1) *7 - + save_wday - w_offset); + + saved_wday - w_offset); if (!have_mday || !have_mon) { @@ -1134,7 +1134,7 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) - __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1); } - tm->tm_wday = save_wday; + tm->tm_wday = saved_wday; } return (char *) rp; diff --git a/lib/tempname.c b/lib/tempname.c index fec5f7b29d..446ddeaef1 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -193,7 +193,7 @@ try_tempname_len (char *tmpl, int suffixlen, void *args, char *XXXXXX; unsigned int count; int fd = -1; - int save_errno = errno; + int saved_errno = errno; /* A lower bound on the number of temporary files to attempt to generate. The maximum total number of temporary file names that @@ -258,7 +258,7 @@ try_tempname_len (char *tmpl, int suffixlen, void *args, fd = tryfunc (tmpl, args); if (fd >= 0) { - __set_errno (save_errno); + __set_errno (saved_errno); return fd; } else if (errno != EEXIST) diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index 3448c40bbd..99c99d1b0f 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,4 +1,4 @@ -# 00gnulib.m4 serial 8 +# 00gnulib.m4 serial 9 dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -49,14 +49,14 @@ dnl AC_REQUIRE([gl_COMPILER_CLANG]) [if test $gl_cv_compiler_clang = yes; then dnl Test whether the compiler supports the option dnl '-Werror=implicit-function-declaration'. - save_ac_compile="$ac_compile" + saved_ac_compile="$ac_compile" ac_compile="$ac_compile -Werror=implicit-function-declaration" dnl Use _AC_COMPILE_IFELSE instead of AC_COMPILE_IFELSE, to avoid a dnl warning "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS". _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])], [gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'], [gl_cv_compiler_check_decl_option=none]) - ac_compile="$save_ac_compile" + ac_compile="$saved_ac_compile" else gl_cv_compiler_check_decl_option=none fi @@ -71,11 +71,11 @@ dnl Redefine _AC_CHECK_DECL_BODY so that it references ac_compile_for_check_decl dnl instead of ac_compile. If, for whatever reason, the override of AC_PROG_CC dnl in zzgnulib.m4 is inactive, use the original ac_compile. m4_define([_AC_CHECK_DECL_BODY], -[ ac_save_ac_compile="$ac_compile" +[ ac_saved_ac_compile="$ac_compile" if test -n "$ac_compile_for_check_decl"; then ac_compile="$ac_compile_for_check_decl" fi] -m4_defn([_AC_CHECK_DECL_BODY])[ ac_compile="$ac_save_ac_compile" +m4_defn([_AC_CHECK_DECL_BODY])[ ac_compile="$ac_saved_ac_compile" ]) # gl_00GNULIB diff --git a/m4/acl.m4 b/m4/acl.m4 index 199bf67cbc..2050d108b0 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,5 +1,5 @@ # acl.m4 - check for access control list (ACL) primitives -# serial 29 +# serial 30 # Copyright (C) 2002, 2004-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_FUNC_ACL], dnl On all platforms, the ACL related API is declared in . AC_CHECK_HEADERS([sys/acl.h]) if test $ac_cv_header_sys_acl_h = yes; then - ac_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS dnl Test for POSIX-draft-like API (GNU/Linux, FreeBSD, Mac OS X, dnl IRIX, Tru64, Cygwin >= 2.5). @@ -129,7 +129,7 @@ int type = ACL_TYPE_EXTENDED;]])], fi fi - LIBS=$ac_save_LIBS + LIBS=$gl_saved_LIBS fi if test "$enable_acl$use_acl" = yes0; then diff --git a/m4/acosf.m4 b/m4/acosf.m4 index 11e95ed291..3ae6733512 100644 --- a/m4/acosf.m4 +++ b/m4/acosf.m4 @@ -1,4 +1,4 @@ -# acosf.m4 serial 3 +# acosf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_ACOSF], dnl Test whether acosf() exists. Assume that acosf(), if it exists, is dnl defined in the same library as acos(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ACOS_LIBM" AC_CHECK_FUNCS([acosf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_acosf = yes; then ACOSF_LIBM="$ACOS_LIBM" else diff --git a/m4/acosl.m4 b/m4/acosl.m4 index ce56ccc0d4..f3a96565ca 100644 --- a/m4/acosl.m4 +++ b/m4/acosl.m4 @@ -1,4 +1,4 @@ -# acosl.m4 serial 9 +# acosl.m4 serial 10 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_ACOSL], AC_CACHE_CHECK([whether acosl() can be used with libm], [gl_cv_func_acosl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_ACOSL], || acosl (x) > 1;]])], [gl_cv_func_acosl_in_libm=yes], [gl_cv_func_acosl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_acosl_in_libm = yes; then ACOSL_LIBM=-lm diff --git a/m4/ansi-c++.m4 b/m4/ansi-c++.m4 index 726e582f68..df79345f03 100644 --- a/m4/ansi-c++.m4 +++ b/m4/ansi-c++.m4 @@ -1,4 +1,4 @@ -# ansi-c++.m4 serial 12 +# ansi-c++.m4 serial 13 dnl Copyright (C) 2002-2003, 2005, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -49,7 +49,7 @@ AC_DEFUN([gl_PROG_ANSI_CXX], [ AC_REQUIRE([gl_CXX_CHOICE]) m4_if([$1], [CXX], [], - [gl_save_CXX="$CXX"]) + [gl_saved_CXX="$CXX"]) if test "$CXX_CHOICE" = no; then CXX=no fi @@ -111,7 +111,7 @@ EOF fi m4_if([$1], [CXX], [], [$1="$CXX" - CXX="$gl_save_CXX"]) + CXX="$gl_saved_CXX"]) AC_SUBST([$1]) AM_CONDITIONAL([$2], [test "$$1" != no]) diff --git a/m4/argz.m4 b/m4/argz.m4 index 172b800a06..5c1f3d4ed7 100644 --- a/m4/argz.m4 +++ b/m4/argz.m4 @@ -7,7 +7,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 14 argz.m4 +# serial 15 argz.m4 AC_DEFUN([gl_FUNC_ARGZ], [gl_PREREQ_ARGZ @@ -50,10 +50,10 @@ AS_IF([! $GL_GENERATE_ARGZ_H], lt_cv_sys_argz_works="$gl_cross_guess_normal" else lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' - save_IFS=$IFS + saved_IFS=$IFS IFS=-. set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` - IFS=$save_IFS + IFS=$saved_IFS lt_os_major=${2-0} lt_os_minor=${3-0} lt_os_micro=${4-0} diff --git a/m4/asinf.m4 b/m4/asinf.m4 index 963b20243c..dec8cbfe2b 100644 --- a/m4/asinf.m4 +++ b/m4/asinf.m4 @@ -1,4 +1,4 @@ -# asinf.m4 serial 3 +# asinf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_ASINF], dnl Test whether asinf() exists. Assume that asinf(), if it exists, is dnl defined in the same library as asin(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ASIN_LIBM" AC_CHECK_FUNCS([asinf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_asinf = yes; then ASINF_LIBM="$ASIN_LIBM" else diff --git a/m4/asinl.m4 b/m4/asinl.m4 index 9b510b4b10..6fe6f627c9 100644 --- a/m4/asinl.m4 +++ b/m4/asinl.m4 @@ -1,4 +1,4 @@ -# asinl.m4 serial 9 +# asinl.m4 serial 10 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_ASINL], AC_CACHE_CHECK([whether asinl() can be used with libm], [gl_cv_func_asinl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_ASINL], || asinl (x) > 1;]])], [gl_cv_func_asinl_in_libm=yes], [gl_cv_func_asinl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_asinl_in_libm = yes; then ASINL_LIBM=-lm diff --git a/m4/assert_h.m4 b/m4/assert_h.m4 index a73e45f064..d3d4c42519 100644 --- a/m4/assert_h.m4 +++ b/m4/assert_h.m4 @@ -9,10 +9,10 @@ dnl From Paul Eggert. AC_DEFUN([gl_ASSERT_H], [ AC_CACHE_CHECK([for static_assert], [gl_cv_static_assert], - [gl_save_CFLAGS=$CFLAGS + [gl_saved_CFLAGS=$CFLAGS for gl_working in "yes, a keyword" "yes, an macro"; do AS_CASE([$gl_working], - [*assert.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H"]) + [*assert.h*], [CFLAGS="$gl_saved_CFLAGS -DINCLUDE_ASSERT_H"]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -32,7 +32,7 @@ AC_DEFUN([gl_ASSERT_H], ]])], [gl_cv_static_assert=$gl_working], [gl_cv_static_assert=no]) - CFLAGS=$gl_save_CFLAGS + CFLAGS=$gl_saved_CFLAGS test "$gl_cv_static_assert" != no && break done]) diff --git a/m4/atan2f.m4 b/m4/atan2f.m4 index 394ab16ca1..70b212a7c9 100644 --- a/m4/atan2f.m4 +++ b/m4/atan2f.m4 @@ -1,4 +1,4 @@ -# atan2f.m4 serial 3 +# atan2f.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_ATAN2F], dnl Test whether atan2f() exists. Assume that atan2f(), if it exists, is dnl defined in the same library as atan2(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ATAN2_LIBM" AC_CHECK_FUNCS([atan2f]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_atan2f = yes; then ATAN2F_LIBM="$ATAN2_LIBM" else diff --git a/m4/atanf.m4 b/m4/atanf.m4 index dc0301b51b..17dd2430b2 100644 --- a/m4/atanf.m4 +++ b/m4/atanf.m4 @@ -1,4 +1,4 @@ -# atanf.m4 serial 3 +# atanf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_ATANF], dnl Test whether atanf() exists. Assume that atanf(), if it exists, is dnl defined in the same library as atan(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ATAN_LIBM" AC_CHECK_FUNCS([atanf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_atanf = yes; then ATANF_LIBM="$ATAN_LIBM" else diff --git a/m4/atanl.m4 b/m4/atanl.m4 index 1275f66c5a..8ce5b269d3 100644 --- a/m4/atanl.m4 +++ b/m4/atanl.m4 @@ -1,4 +1,4 @@ -# atanl.m4 serial 9 +# atanl.m4 serial 10 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_ATANL], AC_CACHE_CHECK([whether atanl() can be used with libm], [gl_cv_func_atanl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_ATANL], || atanl (x) > 1;]])], [gl_cv_func_atanl_in_libm=yes], [gl_cv_func_atanl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_atanl_in_libm = yes; then ATANL_LIBM=-lm diff --git a/m4/cbrt.m4 b/m4/cbrt.m4 index da400eba0e..35cf724100 100644 --- a/m4/cbrt.m4 +++ b/m4/cbrt.m4 @@ -1,4 +1,4 @@ -# cbrt.m4 serial 2 +# cbrt.m4 serial 3 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,10 +15,10 @@ AC_DEFUN([gl_FUNC_CBRT], gl_COMMON_DOUBLE_MATHFUNC([cbrt]) dnl Test whether cbrt() exists. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $CBRT_LIBM" AC_CHECK_FUNCS([cbrt]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_cbrt = no; then HAVE_CBRT=0 dnl Find libraries needed to link lib/cbrt.c. diff --git a/m4/cbrtf.m4 b/m4/cbrtf.m4 index f6ae7338b3..45f3506b86 100644 --- a/m4/cbrtf.m4 +++ b/m4/cbrtf.m4 @@ -1,4 +1,4 @@ -# cbrtf.m4 serial 5 +# cbrtf.m4 serial 6 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,19 +14,19 @@ AC_DEFUN([gl_FUNC_CBRTF], dnl Test whether cbrtf() exists. Assume that cbrtf(), if it exists, is dnl defined in the same library as cbrt(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $CBRT_LIBM" AC_CHECK_FUNCS([cbrtf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_cbrtf = yes; then CBRTF_LIBM="$CBRT_LIBM" dnl Also check whether it's declared. dnl IRIX 6.5 has cbrtf() in libm but doesn't declare it in . AC_CHECK_DECL([cbrtf], , [HAVE_DECL_CBRTF=0], [[#include ]]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $CBRTF_LIBM" gl_FUNC_CBRTF_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_cbrtf_works" in *yes) ;; *) REPLACE_CBRTF=1 ;; diff --git a/m4/cbrtl.m4 b/m4/cbrtl.m4 index 7fdd00c68a..e945a4ee81 100644 --- a/m4/cbrtl.m4 +++ b/m4/cbrtl.m4 @@ -1,4 +1,4 @@ -# cbrtl.m4 serial 12 +# cbrtl.m4 serial 13 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,20 +16,20 @@ AC_DEFUN([gl_FUNC_CBRTL], dnl Test whether cbrtl() exists. Assume that cbrtl(), if it exists, is dnl defined in the same library as cbrt(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $CBRT_LIBM" AC_CHECK_FUNCS([cbrtl]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_cbrtl = yes; then CBRTL_LIBM="$CBRT_LIBM" dnl Also check whether it's declared. dnl IRIX 6.5 has cbrtl() in libm but doesn't declare it in . AC_CHECK_DECL([cbrtl], , [HAVE_DECL_CBRTL=0], [[#include ]]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $CBRTL_LIBM" gl_FUNC_CBRTL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_cbrtl_works" in *yes) ;; *) REPLACE_CBRTL=1 ;; @@ -41,7 +41,7 @@ AC_DEFUN([gl_FUNC_CBRTL], AC_CACHE_CHECK([whether cbrtl works according to ISO C 99 with IEC 60559], [gl_cv_func_cbrtl_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $CBRTL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -82,7 +82,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_cbrtl_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_cbrtl_ieee" in *yes) ;; diff --git a/m4/ceil.m4 b/m4/ceil.m4 index 23b6034f71..42d0a06f61 100644 --- a/m4/ceil.m4 +++ b/m4/ceil.m4 @@ -1,4 +1,4 @@ -# ceil.m4 serial 17 +# ceil.m4 serial 18 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_CEIL], AC_CACHE_CHECK([whether ceil works according to ISO C 99 with IEC 60559], [gl_cv_func_ceil_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $CEIL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -56,7 +56,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_ceil_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_ceil_ieee" in *yes) ;; @@ -88,7 +88,7 @@ AC_DEFUN([gl_FUNC_CEIL_LIBS], [[x = funcptr(x) + ceil(x);]])], [gl_cv_func_ceil_libm=]) if test "$gl_cv_func_ceil_libm" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -100,7 +100,7 @@ AC_DEFUN([gl_FUNC_CEIL_LIBS], double x;]], [[x = funcptr(x) + ceil(x);]])], [gl_cv_func_ceil_libm="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi ]) CEIL_LIBM="$gl_cv_func_ceil_libm" diff --git a/m4/ceilf.m4 b/m4/ceilf.m4 index e4d5cc6bd4..43a5c52f35 100644 --- a/m4/ceilf.m4 +++ b/m4/ceilf.m4 @@ -1,4 +1,4 @@ -# ceilf.m4 serial 21 +# ceilf.m4 serial 22 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_CEILF], AC_CACHE_CHECK([whether ceilf works according to ISO C 99 with IEC 60559], [gl_cv_func_ceilf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $CEILF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -63,7 +63,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_ceilf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_ceilf_ieee" in *yes) ;; @@ -98,7 +98,7 @@ AC_DEFUN([gl_FUNC_CEILF_LIBS], [[x = funcptr(x) + ceilf(x);]])], [gl_cv_func_ceilf_libm=]) if test "$gl_cv_func_ceilf_libm" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -110,7 +110,7 @@ AC_DEFUN([gl_FUNC_CEILF_LIBS], float x;]], [[x = funcptr(x) + ceilf(x);]])], [gl_cv_func_ceilf_libm="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi ]) CEILF_LIBM="$gl_cv_func_ceilf_libm" diff --git a/m4/ceill.m4 b/m4/ceill.m4 index 834f47cd06..33765f0e22 100644 --- a/m4/ceill.m4 +++ b/m4/ceill.m4 @@ -1,4 +1,4 @@ -# ceill.m4 serial 24 +# ceill.m4 serial 25 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -29,7 +29,7 @@ AC_DEFUN([gl_FUNC_CEILL], AC_CACHE_CHECK([whether ceill works according to ISO C 99 with IEC 60559], [gl_cv_func_ceill_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $CEILL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -62,7 +62,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_ceill_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_ceill_ieee" in *yes) ;; @@ -78,7 +78,7 @@ int main (int argc, char *argv[]) if test $REPLACE_CEILL = 0 ; then AC_CACHE_CHECK([whether ceill() works], [gl_cv_func_ceill_works], - [save_LIBS="$LIBS" + [saved_LIBS="$LIBS" LIBS="$CEILL_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM( @@ -94,7 +94,7 @@ long double d = 0.3L;]], *) gl_cv_func_ceill_works="guessing yes" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_ceill_works" in *yes) ;; @@ -130,7 +130,7 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS], [[x = funcptr(x) + ceill(x);]])], [gl_cv_func_ceill_libm=]) if test "$gl_cv_func_ceill_libm" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -142,7 +142,7 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS], long double x;]], [[x = funcptr(x) + ceill(x);]])], [gl_cv_func_ceill_libm="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi ]) CEILL_LIBM="$gl_cv_func_ceill_libm" diff --git a/m4/check-math-lib.m4 b/m4/check-math-lib.m4 index 825e33adbd..59f949d813 100644 --- a/m4/check-math-lib.m4 +++ b/m4/check-math-lib.m4 @@ -1,4 +1,4 @@ -# check-math-lib.m4 serial 4 +# check-math-lib.m4 serial 5 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -13,10 +13,10 @@ dnl link either way. dnl dnl Example: gl_CHECK_MATH_LIB([ROUNDF_LIBM], [x = roundf (x);]) AC_DEFUN([gl_CHECK_MATH_LIB], [ - save_LIBS=$LIBS + saved_LIBS="$LIBS" $1=missing for libm in "" "-lm"; do - LIBS="$save_LIBS $libm" + LIBS="$saved_LIBS $libm" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #ifndef __NO_MATH_INLINES # define __NO_MATH_INLINES 1 /* for glibc */ @@ -28,5 +28,5 @@ AC_DEFUN([gl_CHECK_MATH_LIB], [ [$1=$libm break]) done - LIBS=$save_LIBS + LIBS="$saved_LIBS" ]) diff --git a/m4/configmake.m4 b/m4/configmake.m4 index 57774504df..c940763fcb 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,4 +1,4 @@ -# configmake.m4 serial 5 +# configmake.m4 serial 6 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -42,33 +42,33 @@ AC_DEFUN([gl_CONFIGMAKE], AC_REQUIRE([gl_CONFIGMAKE_PREP]) dnl Save the values. - gl_save_prefix="${prefix}" - gl_save_exec_prefix="${exec_prefix}" - gl_save_bindir="${bindir}" - gl_save_sbindir="${sbindir}" - gl_save_libexecdir="${libexecdir}" - gl_save_datarootdir="${datarootdir}" - gl_save_datadir="${datadir}" - gl_save_sysconfdir="${sysconfdir}" - gl_save_sharedstatedir="${sharedstatedir}" - gl_save_localstatedir="${localstatedir}" - gl_save_runstatedir="${runstatedir}" - gl_save_includedir="${includedir}" - gl_save_oldincludedir="${oldincludedir}" - gl_save_docdir="${docdir}" - gl_save_infodir="${infodir}" - gl_save_htmldir="${htmldir}" - gl_save_dvidir="${dvidir}" - gl_save_pdfdir="${pdfdir}" - gl_save_psdir="${psdir}" - gl_save_libdir="${libdir}" - gl_save_lispdir="${lispdir}" - gl_save_localedir="${localedir}" - gl_save_mandir="${mandir}" - gl_save_pkgdatadir="${pkgdatadir}" - gl_save_pkgincludedir="${pkgincludedir}" - gl_save_pkglibdir="${pkglibdir}" - gl_save_pkglibexecdir="${pkglibexecdir}" + gl_saved_prefix="${prefix}" + gl_saved_exec_prefix="${exec_prefix}" + gl_saved_bindir="${bindir}" + gl_saved_sbindir="${sbindir}" + gl_saved_libexecdir="${libexecdir}" + gl_saved_datarootdir="${datarootdir}" + gl_saved_datadir="${datadir}" + gl_saved_sysconfdir="${sysconfdir}" + gl_saved_sharedstatedir="${sharedstatedir}" + gl_saved_localstatedir="${localstatedir}" + gl_saved_runstatedir="${runstatedir}" + gl_saved_includedir="${includedir}" + gl_saved_oldincludedir="${oldincludedir}" + gl_saved_docdir="${docdir}" + gl_saved_infodir="${infodir}" + gl_saved_htmldir="${htmldir}" + gl_saved_dvidir="${dvidir}" + gl_saved_pdfdir="${pdfdir}" + gl_saved_psdir="${psdir}" + gl_saved_libdir="${libdir}" + gl_saved_lispdir="${lispdir}" + gl_saved_localedir="${localedir}" + gl_saved_mandir="${mandir}" + gl_saved_pkgdatadir="${pkgdatadir}" + gl_saved_pkgincludedir="${pkgincludedir}" + gl_saved_pkglibdir="${pkglibdir}" + gl_saved_pkglibexecdir="${pkglibexecdir}" dnl Find the final values. dnl Unfortunately, prefix gets only finally determined at the end of @@ -138,31 +138,31 @@ AC_DEFUN([gl_CONFIGMAKE], gl_BUILD_TO_HOST([pkglibexecdir]) dnl Restore the values. - pkglibexecdir="${gl_save_pkglibexecdir}" - pkglibdir="${gl_save_pkglibdir}" - pkgincludedir="${gl_save_pkgincludedir}" - pkgdatadir="${gl_save_pkgdatadir}" - mandir="${gl_save_mandir}" - localedir="${gl_save_localedir}" - lispdir="${gl_save_lispdir}" - libdir="${gl_save_libdir}" - psdir="${gl_save_psdir}" - pdfdir="${gl_save_pdfdir}" - dvidir="${gl_save_dvidir}" - htmldir="${gl_save_htmldir}" - infodir="${gl_save_infodir}" - docdir="${gl_save_docdir}" - oldincludedir="${gl_save_oldincludedir}" - includedir="${gl_save_includedir}" - runstatedir="${gl_save_runstatedir}" - localstatedir="${gl_save_localstatedir}" - sharedstatedir="${gl_save_sharedstatedir}" - sysconfdir="${gl_save_sysconfdir}" - datadir="${gl_save_datadir}" - datarootdir="${gl_save_datarootdir}" - libexecdir="${gl_save_libexecdir}" - sbindir="${gl_save_sbindir}" - bindir="${gl_save_bindir}" - exec_prefix="${gl_save_exec_prefix}" - prefix="${gl_save_prefix}" + pkglibexecdir="${gl_saved_pkglibexecdir}" + pkglibdir="${gl_saved_pkglibdir}" + pkgincludedir="${gl_saved_pkgincludedir}" + pkgdatadir="${gl_saved_pkgdatadir}" + mandir="${gl_saved_mandir}" + localedir="${gl_saved_localedir}" + lispdir="${gl_saved_lispdir}" + libdir="${gl_saved_libdir}" + psdir="${gl_saved_psdir}" + pdfdir="${gl_saved_pdfdir}" + dvidir="${gl_saved_dvidir}" + htmldir="${gl_saved_htmldir}" + infodir="${gl_saved_infodir}" + docdir="${gl_saved_docdir}" + oldincludedir="${gl_saved_oldincludedir}" + includedir="${gl_saved_includedir}" + runstatedir="${gl_saved_runstatedir}" + localstatedir="${gl_saved_localstatedir}" + sharedstatedir="${gl_saved_sharedstatedir}" + sysconfdir="${gl_saved_sysconfdir}" + datadir="${gl_saved_datadir}" + datarootdir="${gl_saved_datarootdir}" + libexecdir="${gl_saved_libexecdir}" + sbindir="${gl_saved_sbindir}" + bindir="${gl_saved_bindir}" + exec_prefix="${gl_saved_exec_prefix}" + prefix="${gl_saved_prefix}" ]) diff --git a/m4/cosf.m4 b/m4/cosf.m4 index 42682aae0e..7e3ee404d6 100644 --- a/m4/cosf.m4 +++ b/m4/cosf.m4 @@ -1,4 +1,4 @@ -# cosf.m4 serial 3 +# cosf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_COSF], dnl Test whether cosf() exists. Assume that cosf(), if it exists, is dnl defined in the same library as cos(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $COS_LIBM" AC_CHECK_FUNCS([cosf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_cosf = yes; then COSF_LIBM="$COS_LIBM" else diff --git a/m4/coshf.m4 b/m4/coshf.m4 index 52be70423c..712d89278b 100644 --- a/m4/coshf.m4 +++ b/m4/coshf.m4 @@ -1,4 +1,4 @@ -# coshf.m4 serial 3 +# coshf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_COSHF], dnl Test whether coshf() exists. Assume that coshf(), if it exists, is dnl defined in the same library as cosh(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $COSH_LIBM" AC_CHECK_FUNCS([coshf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_coshf = yes; then COSHF_LIBM="$COSH_LIBM" else diff --git a/m4/cosl.m4 b/m4/cosl.m4 index 44951dc085..d91fc358a9 100644 --- a/m4/cosl.m4 +++ b/m4/cosl.m4 @@ -1,4 +1,4 @@ -# cosl.m4 serial 9 +# cosl.m4 serial 10 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_COSL], AC_CACHE_CHECK([whether cosl() can be used with libm], [gl_cv_func_cosl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_COSL], || cosl (x) > 0.4;]])], [gl_cv_func_cosl_in_libm=yes], [gl_cv_func_cosl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_cosl_in_libm = yes; then COSL_LIBM=-lm diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index d4c4e6bec7..e58582e614 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -1,4 +1,4 @@ -# serial 29 -*- Autoconf -*- +# serial 30 -*- Autoconf -*- dnl Find out how to get the file descriptor associated with an open DIR*. @@ -55,7 +55,7 @@ AC_DEFUN([gl_PREREQ_DIRFD], AC_CACHE_CHECK([how to get the file descriptor associated with an open DIR*], [gl_cv_sys_dir_fd_member_name], [ - dirfd_save_CFLAGS=$CFLAGS + gl_saved_CFLAGS=$CFLAGS for ac_expr in d_fd dd_fd; do CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr" @@ -65,7 +65,7 @@ AC_DEFUN([gl_PREREQ_DIRFD], [[DIR *dir_p = opendir("."); (void) dir_p->DIR_FD_MEMBER_NAME;]])], [dir_fd_found=yes] ) - CFLAGS=$dirfd_save_CFLAGS + CFLAGS=$gl_saved_CFLAGS test "$dir_fd_found" = yes && break done test "$dir_fd_found" = yes || ac_expr=no_such_member diff --git a/m4/exp2.m4 b/m4/exp2.m4 index a7691bbb24..9910919687 100644 --- a/m4/exp2.m4 +++ b/m4/exp2.m4 @@ -1,4 +1,4 @@ -# exp2.m4 serial 4 +# exp2.m4 serial 5 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_EXP2], AC_CACHE_CHECK([whether exp2() can be used with libm], [gl_cv_func_exp2_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -56,7 +56,7 @@ AC_DEFUN([gl_FUNC_EXP2], || exp2 (x) > 1.5;]])], [gl_cv_func_exp2_in_libm=yes], [gl_cv_func_exp2_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_exp2_in_libm = yes; then EXP2_LIBM=-lm @@ -68,10 +68,10 @@ AC_DEFUN([gl_FUNC_EXP2], dnl Also check whether it's declared. dnl IRIX 6.5 has exp2() in libm but doesn't declare it in . AC_CHECK_DECL([exp2], , [HAVE_DECL_EXP2=0], [[#include ]]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXP2_LIBM" gl_FUNC_EXP2_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_exp2_works" in *yes) ;; *) REPLACE_EXP2=1 ;; diff --git a/m4/exp2f.m4 b/m4/exp2f.m4 index 0547bd55ed..ad5e947b49 100644 --- a/m4/exp2f.m4 +++ b/m4/exp2f.m4 @@ -1,4 +1,4 @@ -# exp2f.m4 serial 1 +# exp2f.m4 serial 2 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_EXP2F], dnl Test whether exp2f() exists. Assume that exp2f(), if it exists, is dnl defined in the same library as exp2(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXP2_LIBM" AC_CHECK_FUNCS([exp2f]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_exp2f = yes; then HAVE_EXP2F=1 EXP2F_LIBM="$EXP2_LIBM" diff --git a/m4/exp2l.m4 b/m4/exp2l.m4 index de657bcae8..e3f476c1f7 100644 --- a/m4/exp2l.m4 +++ b/m4/exp2l.m4 @@ -1,4 +1,4 @@ -# exp2l.m4 serial 12 +# exp2l.m4 serial 13 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,10 +16,10 @@ AC_DEFUN([gl_FUNC_EXP2L], dnl Test whether exp2l() exists. Assume that exp2l(), if it exists, is dnl defined in the same library as exp2(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXP2_LIBM" AC_CHECK_FUNCS([exp2l]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_exp2l = yes; then HAVE_EXP2L=1 EXP2L_LIBM="$EXP2_LIBM" @@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_EXP2L], AC_CACHE_CHECK([whether exp2l works], [gl_cv_func_exp2l_works], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXP2L_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -109,7 +109,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_exp2l_works="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_exp2l_works" in *yes) ;; @@ -122,7 +122,7 @@ int main (int argc, char *argv[]) AC_CACHE_CHECK([whether exp2l works according to ISO C 99 with IEC 60559], [gl_cv_func_exp2l_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXP2L_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -164,7 +164,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_exp2l_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_exp2l_ieee" in *yes) ;; diff --git a/m4/expf.m4 b/m4/expf.m4 index bb76545bc9..15390d76e1 100644 --- a/m4/expf.m4 +++ b/m4/expf.m4 @@ -1,4 +1,4 @@ -# expf.m4 serial 3 +# expf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_EXPF], dnl Test whether expf() exists. Assume that expf(), if it exists, is dnl defined in the same library as exp(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXP_LIBM" AC_CHECK_FUNCS([expf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_expf = yes; then EXPF_LIBM="$EXP_LIBM" else diff --git a/m4/expl.m4 b/m4/expl.m4 index 6a45e425e0..32497fcf17 100644 --- a/m4/expl.m4 +++ b/m4/expl.m4 @@ -1,4 +1,4 @@ -# expl.m4 serial 20 +# expl.m4 serial 21 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_EXPL], AC_CACHE_CHECK([whether expl() can be used with libm], [gl_cv_func_expl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -48,7 +48,7 @@ AC_DEFUN([gl_FUNC_EXPL], || expl (x) > 1.5;]])], [gl_cv_func_expl_in_libm=yes], [gl_cv_func_expl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_expl_in_libm = yes; then EXPL_LIBM=-lm @@ -64,7 +64,7 @@ AC_DEFUN([gl_FUNC_EXPL], AC_CACHE_CHECK([whether expl works], [gl_cv_func_expl_works], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXPL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -158,7 +158,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_expl_works="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_expl_works" in *yes) ;; diff --git a/m4/expm1.m4 b/m4/expm1.m4 index 5a29498ff0..aef4e37e15 100644 --- a/m4/expm1.m4 +++ b/m4/expm1.m4 @@ -1,4 +1,4 @@ -# expm1.m4 serial 11 +# expm1.m4 serial 12 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_EXPM1], AC_CACHE_CHECK([whether expm1() can be used with libm], [gl_cv_func_expm1_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_EXPM1], || expm1 (x) > 0.5;]])], [gl_cv_func_expm1_in_libm=yes], [gl_cv_func_expm1_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_expm1_in_libm = yes; then EXPM1_LIBM=-lm @@ -62,7 +62,7 @@ AC_DEFUN([gl_FUNC_EXPM1], AC_CACHE_CHECK([whether expm1 works according to ISO C 99 with IEC 60559], [gl_cv_func_expm1_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXPM1_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -95,7 +95,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_expm1_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_expm1_ieee" in *yes) ;; diff --git a/m4/expm1f.m4 b/m4/expm1f.m4 index c331faf742..379e191948 100644 --- a/m4/expm1f.m4 +++ b/m4/expm1f.m4 @@ -1,4 +1,4 @@ -# expm1f.m4 serial 6 +# expm1f.m4 serial 7 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,17 +15,17 @@ AC_DEFUN([gl_FUNC_EXPM1F], dnl Test whether expm1f() exists. Assume that expm1f(), if it exists, is dnl defined in the same library as expm1(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXPM1_LIBM" AC_CHECK_FUNCS([expm1f]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_expm1f = yes; then EXPM1F_LIBM="$EXPM1_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXPM1F_LIBM" gl_FUNC_EXPM1F_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_expm1f_works" in *yes) ;; *) REPLACE_EXPM1F=1 ;; @@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_EXPM1F], AC_CACHE_CHECK([whether expm1f works according to ISO C 99 with IEC 60559], [gl_cv_func_expm1f_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXPM1F_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -89,7 +89,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_expm1f_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_expm1f_ieee" in *yes) ;; diff --git a/m4/expm1l.m4 b/m4/expm1l.m4 index d58149a0e1..5f8ef26a8f 100644 --- a/m4/expm1l.m4 +++ b/m4/expm1l.m4 @@ -1,4 +1,4 @@ -# expm1l.m4 serial 11 +# expm1l.m4 serial 12 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_EXPM1L], AC_CACHE_CHECK([whether expm1l() can be used with libm], [gl_cv_func_expm1l_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -57,7 +57,7 @@ AC_DEFUN([gl_FUNC_EXPM1L], || expm1l (x) > 0.5;]])], [gl_cv_func_expm1l_in_libm=yes], [gl_cv_func_expm1l_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_expm1l_in_libm = yes; then EXPM1L_LIBM=-lm @@ -74,7 +74,7 @@ AC_DEFUN([gl_FUNC_EXPM1L], AC_CACHE_CHECK([whether expm1l works], [gl_cv_func_expm1l_works], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $EXPM1L_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -156,7 +156,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_expm1l_works="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_expm1l_works" in *yes) ;; diff --git a/m4/fabsl.m4 b/m4/fabsl.m4 index cdd529d9da..e536189bb5 100644 --- a/m4/fabsl.m4 +++ b/m4/fabsl.m4 @@ -1,4 +1,4 @@ -# fabsl.m4 serial 4 +# fabsl.m4 serial 5 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,10 +16,10 @@ AC_DEFUN([gl_FUNC_FABSL], gl_MATHFUNC([fabsl], [long double], [(long double)]) if test $gl_cv_func_fabsl_no_libm = yes \ || test $gl_cv_func_fabsl_in_libm = yes; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FABSL_LIBM" gl_FUNC_FABSL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_fabsl_works" in *yes) ;; *) REPLACE_FABSL=1 ;; diff --git a/m4/fenv-environment.m4 b/m4/fenv-environment.m4 index 16bf513707..8d3911e6e4 100644 --- a/m4/fenv-environment.m4 +++ b/m4/fenv-environment.m4 @@ -1,4 +1,4 @@ -# fenv-environment.m4 serial 1 +# fenv-environment.m4 serial 2 dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_var_FE_DFL_ENV_works], [case "$host_os" in netbsd* | cygwin*) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM([[ @@ -29,7 +29,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], ], [gl_cv_var_FE_DFL_ENV_works=yes], [gl_cv_var_FE_DFL_ENV_works=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; *) gl_cv_var_FE_DFL_ENV_works="guessing yes" @@ -118,7 +118,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], ;; *) dnl This test fails on FreeBSD 12.2/arm64. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FENV_ENVIRONMENT_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -134,7 +134,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_func_feholdexcept_works="guessing yes"], [gl_cv_func_feholdexcept_works=no], [gl_cv_func_feholdexcept_works="guessing yes"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; esac ]) @@ -193,7 +193,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], ], [gl_cv_func_fesetenv_works="guessing yes"]) ;; *-*-aix*) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FENV_ENVIRONMENT_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -217,10 +217,10 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_func_fesetenv_works="guessing yes"], [gl_cv_func_fesetenv_works=no], [gl_cv_func_fesetenv_works="guessing no"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; *-*-solaris*) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FENV_ENVIRONMENT_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -257,7 +257,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_func_fesetenv_works="guessing yes"], [gl_cv_func_fesetenv_works=no], [gl_cv_func_fesetenv_works="guessing no"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; # Guess no on NetBSD/m68k. m68*-*-netbsd*) @@ -271,7 +271,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], dnl This test fails on FreeBSD 12.2/arm64. dnl Here we test only the rounding mode restoration, but the function dnl is more broken than that. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FENV_ENVIRONMENT_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -288,7 +288,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_func_fesetenv_works="guessing yes"], [gl_cv_func_fesetenv_works=no], [gl_cv_func_fesetenv_works="guessing yes"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; esac ]) @@ -315,7 +315,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [case "$host" in # Guess no on glibc/riscv. riscv*-*-*-gnu*) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FENV_ENVIRONMENT_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -327,11 +327,11 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_func_feupdateenv_works=yes], [gl_cv_func_feupdateenv_works=no], [gl_cv_func_feupdateenv_works="guessing no"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; # Guess no on glibc/hppa. hppa*-*-*-gnu*) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FENV_ENVIRONMENT_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -350,7 +350,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_func_feupdateenv_works=no], [gl_cv_func_feupdateenv_works="guessing yes"], [gl_cv_func_feupdateenv_works="guessing no"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; # Guess no on glibc ≤ 2.5/{i386,x86_64,ia64}. *86*-*-*-gnu* | *86*-*-gnu* | ia64*-*-*-gnu*) @@ -377,7 +377,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], ], [gl_cv_func_feupdateenv_works="guessing yes"]) ;; *-*-aix*) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FENV_ENVIRONMENT_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -401,10 +401,10 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_func_feupdateenv_works="guessing yes"], [gl_cv_func_feupdateenv_works=no], [gl_cv_func_feupdateenv_works="guessing no"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; *-*-solaris*) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FENV_ENVIRONMENT_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -441,7 +441,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_func_feupdateenv_works="guessing yes"], [gl_cv_func_feupdateenv_works=no], [gl_cv_func_feupdateenv_works="guessing no"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; # Guess no on Mac OS X/{i386,x86_64}. *86*-*-darwin*) @@ -455,7 +455,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], dnl This test fails on FreeBSD 12.2/arm64. dnl Here we test only the rounding mode restoration, but the function dnl is more broken than that. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FENV_ENVIRONMENT_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -472,7 +472,7 @@ AC_DEFUN([gl_FENV_ENVIRONMENT], [gl_cv_func_feupdateenv_works="guessing yes"], [gl_cv_func_feupdateenv_works=no], [gl_cv_func_feupdateenv_works="guessing yes"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; esac ]) diff --git a/m4/fenv-exceptions-state.m4 b/m4/fenv-exceptions-state.m4 index be1169d56d..0254518496 100644 --- a/m4/fenv-exceptions-state.m4 +++ b/m4/fenv-exceptions-state.m4 @@ -1,4 +1,4 @@ -# fenv-exceptions-state.m4 serial 2 +# fenv-exceptions-state.m4 serial 3 dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -65,7 +65,7 @@ AC_DEFUN([gl_FENV_EXCEPTIONS_STATE], [if test $gl_cv_func_feenableexcept_no_libm = yes \ || test $gl_cv_func_feenableexcept_in_libm = yes; then dnl A platform that has feenableexcept. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" if test $gl_cv_func_feenableexcept_no_libm != yes; then LIBS="$LIBS -lm" fi @@ -116,7 +116,7 @@ changequote([,])dnl *) gl_cv_func_fesetexceptflag_works1="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" else case "$host_os" in # Guess no on musl libc. @@ -151,7 +151,7 @@ changequote([,])dnl dnl On glibc 2.37 for alpha, fesetexceptflag clears too many flag bits. AC_CACHE_CHECK([whether fesetexceptflag obeys its arguments], [gl_cv_func_fesetexceptflag_works2], - [save_LIBS="$LIBS" + [saved_LIBS="$LIBS" LIBS="$LIBS $FENV_EXCEPTIONS_STATE_LIBM" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -185,7 +185,7 @@ changequote([,])dnl *) gl_cv_func_fesetexceptflag_works2="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_fesetexceptflag_works1" in *yes) ;; diff --git a/m4/fenv-exceptions-tracking-c23.m4 b/m4/fenv-exceptions-tracking-c23.m4 index 6d1ea74979..c29ae03efc 100644 --- a/m4/fenv-exceptions-tracking-c23.m4 +++ b/m4/fenv-exceptions-tracking-c23.m4 @@ -1,4 +1,4 @@ -# fenv-exceptions-tracking-c23.m4 serial 1 +# fenv-exceptions-tracking-c23.m4 serial 2 dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -23,7 +23,7 @@ AC_DEFUN([gl_FENV_EXCEPTIONS_TRACKING_C23], [if test $gl_cv_func_feenableexcept_no_libm = yes \ || test $gl_cv_func_feenableexcept_in_libm = yes; then dnl A platform that has feenableexcept. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" if test $gl_cv_func_feenableexcept_no_libm != yes; then LIBS="$LIBS -lm" fi @@ -61,7 +61,7 @@ changequote([,])dnl *) gl_cv_func_fesetexcept_works="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" else gl_cv_func_fesetexcept_works="guessing yes" fi diff --git a/m4/floor.m4 b/m4/floor.m4 index 88500f77ab..c549b0d880 100644 --- a/m4/floor.m4 +++ b/m4/floor.m4 @@ -1,4 +1,4 @@ -# floor.m4 serial 16 +# floor.m4 serial 17 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_FLOOR], AC_CACHE_CHECK([whether floor works according to ISO C 99 with IEC 60559], [gl_cv_func_floor_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FLOOR_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -52,7 +52,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_floor_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_floor_ieee" in *yes) ;; @@ -84,7 +84,7 @@ AC_DEFUN([gl_FUNC_FLOOR_LIBS], [[x = funcptr(x) + floor(x);]])], [gl_cv_func_floor_libm=]) if test "$gl_cv_func_floor_libm" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -96,7 +96,7 @@ AC_DEFUN([gl_FUNC_FLOOR_LIBS], double x;]], [[x = funcptr(x) + floor(x);]])], [gl_cv_func_floor_libm="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi ]) FLOOR_LIBM="$gl_cv_func_floor_libm" diff --git a/m4/floorf.m4 b/m4/floorf.m4 index 2483fc7714..0811afdbee 100644 --- a/m4/floorf.m4 +++ b/m4/floorf.m4 @@ -1,4 +1,4 @@ -# floorf.m4 serial 20 +# floorf.m4 serial 21 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_FLOORF], AC_CACHE_CHECK([whether floorf works according to ISO C 99 with IEC 60559], [gl_cv_func_floorf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FLOORF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -59,7 +59,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_floorf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_floorf_ieee" in *yes) ;; @@ -94,7 +94,7 @@ AC_DEFUN([gl_FUNC_FLOORF_LIBS], [[x = funcptr(x) + floorf(x);]])], [gl_cv_func_floorf_libm=]) if test "$gl_cv_func_floorf_libm" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -106,7 +106,7 @@ AC_DEFUN([gl_FUNC_FLOORF_LIBS], float x;]], [[x = funcptr(x) + floorf(x);]])], [gl_cv_func_floorf_libm="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi ]) FLOORF_LIBM="$gl_cv_func_floorf_libm" diff --git a/m4/floorl.m4 b/m4/floorl.m4 index cc6c328874..de80a1bd91 100644 --- a/m4/floorl.m4 +++ b/m4/floorl.m4 @@ -1,4 +1,4 @@ -# floorl.m4 serial 11 +# floorl.m4 serial 12 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -54,7 +54,7 @@ AC_DEFUN([gl_FUNC_FLOORL_LIBS], [[x = funcptr (x) + floorl(x);]])], [gl_cv_func_floorl_libm=]) if test "$gl_cv_func_floorl_libm" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -66,7 +66,7 @@ AC_DEFUN([gl_FUNC_FLOORL_LIBS], long double x;]], [[x = funcptr (x) + floorl(x);]])], [gl_cv_func_floorl_libm="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi ]) FLOORL_LIBM="$gl_cv_func_floorl_libm" diff --git a/m4/fma.m4 b/m4/fma.m4 index cff5a1ed39..01c2fcf0d3 100644 --- a/m4/fma.m4 +++ b/m4/fma.m4 @@ -1,4 +1,4 @@ -# fma.m4 serial 6 +# fma.m4 serial 7 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -62,7 +62,7 @@ AC_DEFUN([gl_FUNC_FMA_WORKS], AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_REQUIRE([gl_FUNC_LDEXP]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FMA_LIBM $LDEXP_LIBM" AC_CACHE_CHECK([whether fma works], [gl_cv_func_fma_works], [ @@ -184,7 +184,7 @@ int main() esac ]) ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) # Prerequisites of lib/fma.c. diff --git a/m4/fmaf.m4 b/m4/fmaf.m4 index 55a9f6c4ed..2985d925a2 100644 --- a/m4/fmaf.m4 +++ b/m4/fmaf.m4 @@ -1,4 +1,4 @@ -# fmaf.m4 serial 8 +# fmaf.m4 serial 9 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -65,7 +65,7 @@ AC_DEFUN([gl_FUNC_FMAF_WORKS], AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_REQUIRE([gl_FUNC_LDEXPF]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FMAF_LIBM $LDEXPF_LIBM" AC_CACHE_CHECK([whether fmaf works], [gl_cv_func_fmaf_works], [ @@ -203,7 +203,7 @@ int main() esac ]) ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) # Prerequisites of lib/fmaf.c. diff --git a/m4/fmal.m4 b/m4/fmal.m4 index 4c488ec2ee..d0f041d891 100644 --- a/m4/fmal.m4 +++ b/m4/fmal.m4 @@ -1,4 +1,4 @@ -# fmal.m4 serial 10 +# fmal.m4 serial 11 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -72,7 +72,7 @@ AC_DEFUN([gl_FUNC_FMAL_WORKS], AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_REQUIRE([gl_FUNC_LDEXPL]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FMAL_LIBM $LDEXPL_LIBM" AC_CACHE_CHECK([whether fmal works], [gl_cv_func_fmal_works], [ @@ -401,7 +401,7 @@ int main() esac ]) ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) # Prerequisites of lib/fmal.c. diff --git a/m4/fmod.m4 b/m4/fmod.m4 index e3a9bf1553..30fc24fcda 100644 --- a/m4/fmod.m4 +++ b/m4/fmod.m4 @@ -1,4 +1,4 @@ -# fmod.m4 serial 11 +# fmod.m4 serial 12 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_FMOD], AC_CACHE_CHECK([whether fmod works according to ISO C 99 with IEC 60559], [gl_cv_func_fmod_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FMOD_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -68,7 +68,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_fmod_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_fmod_ieee" in *yes) ;; diff --git a/m4/fmodf.m4 b/m4/fmodf.m4 index 19634c9535..17ee93c8a4 100644 --- a/m4/fmodf.m4 +++ b/m4/fmodf.m4 @@ -1,4 +1,4 @@ -# fmodf.m4 serial 13 +# fmodf.m4 serial 14 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,10 +15,10 @@ AC_DEFUN([gl_FUNC_FMODF], dnl Test whether fmodf() exists. Assume that fmodf(), if it exists, is dnl defined in the same library as fmod(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FMOD_LIBM" AC_CHECK_FUNCS([fmodf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_fmodf = yes; then FMODF_LIBM="$FMOD_LIBM" m4_ifdef([gl_FUNC_FMODF_IEEE], [ @@ -27,7 +27,7 @@ AC_DEFUN([gl_FUNC_FMODF], AC_CACHE_CHECK([whether fmodf works according to ISO C 99 with IEC 60559], [gl_cv_func_fmodf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FMODF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -69,7 +69,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_fmodf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_fmodf_ieee" in *yes) ;; diff --git a/m4/fmodl.m4 b/m4/fmodl.m4 index 73245f62f6..f35396b177 100644 --- a/m4/fmodl.m4 +++ b/m4/fmodl.m4 @@ -1,4 +1,4 @@ -# fmodl.m4 serial 13 +# fmodl.m4 serial 14 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -23,10 +23,10 @@ AC_DEFUN([gl_FUNC_FMODL], dnl Test whether fmodl() exists. Assume that fmodl(), if it exists, is dnl defined in the same library as fmod(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FMOD_LIBM" AC_CHECK_FUNCS([fmodl]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_fmodl = yes; then FMODL_LIBM="$FMOD_LIBM" if test $ac_cv_have_decl_fmodl = no; then @@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_FMODL], AC_CACHE_CHECK([whether fmodl works according to ISO C 99 with IEC 60559], [gl_cv_func_fmodl_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FMODL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -80,7 +80,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_fmodl_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_fmodl_ieee" in *yes) ;; diff --git a/m4/frexp.m4 b/m4/frexp.m4 index c1f2be88c9..54cbb6d5ba 100644 --- a/m4/frexp.m4 +++ b/m4/frexp.m4 @@ -1,4 +1,4 @@ -# frexp.m4 serial 19 +# frexp.m4 serial 20 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_FREXP], AC_CACHE_CHECK([whether frexp() can be used with libm], [gl_cv_func_frexp_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_FREXP], [[int e; return frexp (x, &e) > 0;]])], [gl_cv_func_frexp_in_libm=yes], [gl_cv_func_frexp_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_frexp_in_libm = yes; then FREXP_LIBM=-lm @@ -30,10 +30,10 @@ AC_DEFUN([gl_FUNC_FREXP], fi if test $gl_cv_func_frexp_no_libm = yes \ || test $gl_cv_func_frexp_in_libm = yes; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FREXP_LIBM" gl_FUNC_FREXP_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_frexp_works" in *yes) gl_func_frexp=yes ;; *) gl_func_frexp=no; REPLACE_FREXP=1; FREXP_LIBM= ;; diff --git a/m4/frexpf.m4 b/m4/frexpf.m4 index ebb1922980..a49305a3a9 100644 --- a/m4/frexpf.m4 +++ b/m4/frexpf.m4 @@ -1,4 +1,4 @@ -# frexpf.m4 serial 9 +# frexpf.m4 serial 10 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,10 +18,10 @@ AC_DEFUN([gl_FUNC_FREXPF], gl_MATHFUNC([frexpf], [float], [(float, int *)]) if test $gl_cv_func_frexpf_no_libm = yes \ || test $gl_cv_func_frexpf_in_libm = yes; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FREXPF_LIBM" gl_FUNC_FREXPF_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_frexpf_works" in *yes) ;; *) REPLACE_FREXPF=1 ;; diff --git a/m4/frexpl.m4 b/m4/frexpl.m4 index 11fd3017e3..c434dea70a 100644 --- a/m4/frexpl.m4 +++ b/m4/frexpl.m4 @@ -1,4 +1,4 @@ -# frexpl.m4 serial 23 +# frexpl.m4 serial 24 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -23,7 +23,7 @@ AC_DEFUN([gl_FUNC_FREXPL], AC_CACHE_CHECK([whether frexpl() can be used with libm], [gl_cv_func_frexpl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -32,7 +32,7 @@ AC_DEFUN([gl_FUNC_FREXPL], [[int e; return frexpl (x, &e) > 0;]])], [gl_cv_func_frexpl_in_libm=yes], [gl_cv_func_frexpl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_frexpl_in_libm = yes; then FREXPL_LIBM=-lm @@ -40,10 +40,10 @@ AC_DEFUN([gl_FUNC_FREXPL], fi if test $gl_cv_func_frexpl_no_libm = yes \ || test $gl_cv_func_frexpl_in_libm = yes; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $FREXPL_LIBM" gl_FUNC_FREXPL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_frexpl_works" in *yes) gl_func_frexpl=yes ;; *) gl_func_frexpl=no; REPLACE_FREXPL=1 ;; diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index 30816308ab..371136c38a 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,4 +1,4 @@ -# getaddrinfo.m4 serial 34 +# getaddrinfo.m4 serial 35 dnl Copyright (C) 2004-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -41,7 +41,7 @@ AC_DEFUN([gl_GETADDRINFO], AC_CACHE_CHECK([for getaddrinfo in ws2tcpip.h and -lws2_32], gl_cv_w32_getaddrinfo, [ gl_cv_w32_getaddrinfo=no - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_WS2TCPIP_H @@ -49,7 +49,7 @@ AC_DEFUN([gl_GETADDRINFO], #endif #include ]], [[getaddrinfo(NULL, NULL, NULL, NULL);]])], [gl_cv_w32_getaddrinfo=yes]) - LIBS="$am_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_w32_getaddrinfo" = "yes"; then GETADDRINFO_LIB="-lws2_32" diff --git a/m4/getdomainname.m4 b/m4/getdomainname.m4 index f68f931ca1..4200f8b6f5 100644 --- a/m4/getdomainname.m4 +++ b/m4/getdomainname.m4 @@ -1,4 +1,4 @@ -# getdomainname.m4 serial 13 +# getdomainname.m4 serial 14 dnl Copyright (C) 2002-2003, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME], AC_CACHE_CHECK([for getdomainname in -lnsl], [gl_cv_func_getdomainname_in_libnsl], [gl_cv_func_getdomainname_in_libnsl=no - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lnsl" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME], ]], [[getdomainname(NULL, 0);]])], [gl_cv_func_getdomainname_in_libnsl=yes]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) fi diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index b5f6d9facd..f6e0cbd3fc 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 @@ -1,4 +1,4 @@ -# serial 24 +# serial 25 dnl From Jim Meyering. dnl A wrapper around AC_FUNC_GETGROUPS. @@ -20,7 +20,7 @@ AC_DEFUN([AC_FUNC_GETGROUPS], # If we don't yet have getgroups, see if it's in -lbsd. # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. - ac_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS if test $ac_cv_func_getgroups = no; then AC_CHECK_LIB(bsd, getgroups, [GETGROUPS_LIB=-lbsd]) fi @@ -56,7 +56,7 @@ AC_DEFUN([AC_FUNC_GETGROUPS], [Define to 1 if your system has a working `getgroups' function.]) ;; esac - LIBS=$ac_save_LIBS + LIBS=$gl_saved_LIBS ])# AC_FUNC_GETGROUPS AC_DEFUN([gl_FUNC_GETGROUPS], diff --git a/m4/gethostname.m4 b/m4/gethostname.m4 index 3e7446e5d7..c93d54ed48 100644 --- a/m4/gethostname.m4 +++ b/m4/gethostname.m4 @@ -1,4 +1,4 @@ -# gethostname.m4 serial 15 +# gethostname.m4 serial 16 dnl Copyright (C) 2002, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_GETHOSTNAME], AC_CACHE_CHECK([for gethostname in winsock2.h and -lws2_32], [gl_cv_w32_gethostname], [gl_cv_w32_gethostname=no - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_WINSOCK2_H @@ -28,7 +28,7 @@ AC_DEFUN([gl_FUNC_GETHOSTNAME], #endif #include ]], [[gethostname(NULL, 0);]])], [gl_cv_w32_gethostname=yes]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_w32_gethostname" = "yes"; then GETHOSTNAME_LIB="-lws2_32" diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 12627ab6e3..9d0236f77f 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -7,7 +7,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 12 +#serial 13 # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # New applications should use gl_GETLOADAVG instead. @@ -20,7 +20,7 @@ AC_DEFUN([gl_GETLOADAVG], # Persuade glibc to declare getloadavg(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) -gl_save_LIBS=$LIBS +gl_saved_LIBS=$LIBS # getloadavg is present in libc on glibc >= 2.2, Mac OS X, FreeBSD >= 2.0, # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7. @@ -81,12 +81,12 @@ if test $ac_cv_func_getloadavg != yes; then fi fi -if test "x$gl_save_LIBS" = x; then +if test "x$gl_saved_LIBS" = x; then GETLOADAVG_LIBS=$LIBS else - GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$gl_save_LIBS!!"` + GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$gl_saved_LIBS!!"` fi -LIBS=$gl_save_LIBS +LIBS=$gl_saved_LIBS AC_SUBST([GETLOADAVG_LIBS])dnl diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 40add2ecb0..5d47445d69 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 78 (gettext-0.22.4) +# gettext.m4 serial 79 (gettext-0.23) dnl Copyright (C) 1995-2014, 2016, 2018-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -182,9 +182,9 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION AC_LIB_LINKFLAGS_BODY([intl]) AC_CACHE_CHECK([for GNU gettext in libintl], [$gt_func_gnugettext_libintl], - [gt_save_CPPFLAGS="$CPPFLAGS" + [gt_saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" + gt_saved_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. AC_LINK_IFELSE( @@ -246,8 +246,8 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION eval "$gt_func_gnugettext_libintl=yes" ]) fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) + CPPFLAGS="$gt_saved_CPPFLAGS" + LIBS="$gt_saved_LIBS"]) fi dnl If an already present or preinstalled GNU gettext() is found, @@ -365,9 +365,9 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION dnl Define localedir_c and localedir_c_make. dnl Find the final value of localedir. - gt_save_prefix="${prefix}" - gt_save_datarootdir="${datarootdir}" - gt_save_localedir="${localedir}" + gt_saved_prefix="${prefix}" + gt_saved_datarootdir="${datarootdir}" + gt_saved_localedir="${localedir}" dnl Unfortunately, prefix gets only finally determined at the end of dnl configure. if test "X$prefix" = "XNONE"; then @@ -376,9 +376,9 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION eval datarootdir="$datarootdir" eval localedir="$localedir" gl_BUILD_TO_HOST([localedir]) - localedir="${gt_save_localedir}" - datarootdir="${gt_save_datarootdir}" - prefix="${gt_save_prefix}" + localedir="${gt_saved_localedir}" + datarootdir="${gt_saved_datarootdir}" + prefix="${gt_saved_prefix}" ]) diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 5dd755f9f8..03d10fa51e 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 89 +# gnulib-common.m4 serial 90 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -1166,12 +1166,12 @@ AC_DEFUN([gl_PREPARE_CHECK_FUNCS_MACOS], if test $gl_cv_compiler_clang = yes; then dnl Test whether the compiler supports the option dnl '-Werror=unguarded-availability-new'. - save_ac_compile="$ac_compile" + saved_ac_compile="$ac_compile" ac_compile="$ac_compile -Werror=unguarded-availability-new" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])], [gl_cv_compiler_check_future_option='-Werror=unguarded-availability-new'], [gl_cv_compiler_check_future_option=none]) - ac_compile="$save_ac_compile" + ac_compile="$saved_ac_compile" else gl_cv_compiler_check_future_option=none fi @@ -1219,14 +1219,14 @@ AC_DEFUN([gl_CHECK_FUNCS_CASE_FOR_MACOS], darwin*) if test "x$gl_cv_compiler_check_future_option" != "xnone"; then dnl Use a compile test, not a link test. - save_ac_compile="$ac_compile" + saved_ac_compile="$ac_compile" ac_compile="$ac_compile $gl_cv_compiler_check_future_option" - save_ac_compile_for_check_decl="$ac_compile_for_check_decl" + saved_ac_compile_for_check_decl="$ac_compile_for_check_decl" ac_compile_for_check_decl="$ac_compile_for_check_decl $gl_cv_compiler_check_future_option" unset [ac_cv_have_decl_][$1] AC_CHECK_DECL([$1], , , [$2]) - ac_compile="$save_ac_compile" - ac_compile_for_check_decl="$save_ac_compile_for_check_decl" + ac_compile="$saved_ac_compile" + ac_compile_for_check_decl="$saved_ac_compile_for_check_decl" [ac_cv_func_][$1]="$[ac_cv_have_decl_][$1]" if test $[ac_cv_func_][$1] = yes; then [gl_cv_onwards_func_][$1]=yes diff --git a/m4/hostent.m4 b/m4/hostent.m4 index 48228ad7fe..182189fe2c 100644 --- a/m4/hostent.m4 +++ b/m4/hostent.m4 @@ -1,4 +1,4 @@ -# hostent.m4 serial 4 +# hostent.m4 serial 5 dnl Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ AC_DEFUN([gl_HOSTENT], AC_CACHE_CHECK([for gethostbyname in winsock2.h and -lws2_32], [gl_cv_w32_gethostbyname], [gl_cv_w32_gethostbyname=no - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -38,7 +38,7 @@ AC_DEFUN([gl_HOSTENT], ]], [[gethostbyname(NULL);]])], [gl_cv_w32_gethostbyname=yes]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_w32_gethostbyname" = "yes"; then HOSTENT_LIB="-lws2_32" diff --git a/m4/hypot.m4 b/m4/hypot.m4 index b525e935d1..a1fd8e055a 100644 --- a/m4/hypot.m4 +++ b/m4/hypot.m4 @@ -1,4 +1,4 @@ -# hypot.m4 serial 11 +# hypot.m4 serial 12 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_HYPOT], AC_CACHE_CHECK([whether hypot works according to ISO C 99 with IEC 60559], [gl_cv_func_hypot_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $HYPOT_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -65,7 +65,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_hypot_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_hypot_ieee" in *yes) ;; diff --git a/m4/hypotf.m4 b/m4/hypotf.m4 index d70b5109a2..9a14100524 100644 --- a/m4/hypotf.m4 +++ b/m4/hypotf.m4 @@ -1,4 +1,4 @@ -# hypotf.m4 serial 12 +# hypotf.m4 serial 13 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,17 +15,17 @@ AC_DEFUN([gl_FUNC_HYPOTF], dnl Test whether hypotf() exists. Assume that hypotf(), if it exists, is dnl defined in the same library as hypot(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $HYPOT_LIBM" AC_CHECK_FUNCS([hypotf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_hypotf = yes; then HYPOTF_LIBM="$HYPOT_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $HYPOTF_LIBM" gl_FUNC_HYPOTF_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_hypotf_works" in *yes) ;; *) REPLACE_HYPOTF=1 ;; @@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_HYPOTF], AC_CACHE_CHECK([whether hypotf works according to ISO C 99 with IEC 60559], [gl_cv_func_hypotf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $HYPOTF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -81,7 +81,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_hypotf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_hypotf_ieee" in *yes) ;; diff --git a/m4/hypotl.m4 b/m4/hypotl.m4 index ecea86671c..f722ad9316 100644 --- a/m4/hypotl.m4 +++ b/m4/hypotl.m4 @@ -1,4 +1,4 @@ -# hypotl.m4 serial 13 +# hypotl.m4 serial 14 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,17 +15,17 @@ AC_DEFUN([gl_FUNC_HYPOTL], dnl Test whether hypotl() exists. Assume that hypotl(), if it exists, is dnl defined in the same library as hypot(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $HYPOT_LIBM" AC_CHECK_FUNCS([hypotl]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_hypotl = yes; then HYPOTL_LIBM="$HYPOT_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $HYPOTL_LIBM" gl_FUNC_HYPOTL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_hypotl_works" in *yes) ;; *) REPLACE_HYPOTL=1 ;; @@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_HYPOTL], AC_CACHE_CHECK([whether hypotl works according to ISO C 99 with IEC 60559], [gl_cv_func_hypotl_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $HYPOTL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -81,7 +81,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_hypotl_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_hypotl_ieee" in *yes) ;; diff --git a/m4/iconv.m4 b/m4/iconv.m4 index aa3de6ca35..2a7edd31d8 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 26 +# iconv.m4 serial 27 dnl Copyright (C) 2000-2002, 2007-2014, 2016-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -38,7 +38,7 @@ AC_DEFUN([AM_ICONV_LINK], dnl because if the user has installed libiconv and not disabled its use dnl via --without-libiconv-prefix, he wants to use it. The first dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. - am_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ @@ -55,7 +55,7 @@ AC_DEFUN([AM_ICONV_LINK], iconv_close(cd);]])], [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -68,14 +68,14 @@ AC_DEFUN([AM_ICONV_LINK], iconv_close(cd);]])], [am_cv_lib_iconv=yes] [am_cv_func_iconv=yes]) - LIBS="$am_save_LIBS" + LIBS="$gl_saved_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, dnl Solaris 10. - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi @@ -205,7 +205,7 @@ AC_DEFUN([AM_ICONV_LINK], esac]) test "$am_cv_func_iconv_works" = no || break done - LIBS="$am_save_LIBS" + LIBS="$gl_saved_LIBS" ]) case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; @@ -224,7 +224,7 @@ AC_DEFUN([AM_ICONV_LINK], else dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV dnl either. - CPPFLAGS="$am_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" LIBICONV= LTLIBICONV= fi diff --git a/m4/iconv_open-utf.m4 b/m4/iconv_open-utf.m4 index 172e64f3ae..4e7be21125 100644 --- a/m4/iconv_open-utf.m4 +++ b/m4/iconv_open-utf.m4 @@ -1,4 +1,4 @@ -# iconv_open-utf.m4 serial 5 +# iconv_open-utf.m4 serial 6 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_ICONV_OPEN_UTF_SUPPORT], AC_CACHE_CHECK([whether iconv supports conversion between UTF-8 and UTF-{16,32}{BE,LE}], [gl_cv_func_iconv_supports_utf], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -226,7 +226,7 @@ changequote(,)dnl changequote([,])dnl fi ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) fi ]) diff --git a/m4/ilogb.m4 b/m4/ilogb.m4 index 25d947e77d..413adf1a87 100644 --- a/m4/ilogb.m4 +++ b/m4/ilogb.m4 @@ -1,4 +1,4 @@ -# ilogb.m4 serial 9 +# ilogb.m4 serial 10 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,10 +12,10 @@ AC_DEFUN([gl_FUNC_ILOGB], gl_MATHFUNC([ilogb], [int], [(double)]) if test $gl_cv_func_ilogb_no_libm = yes \ || test $gl_cv_func_ilogb_in_libm = yes; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ILOGB_LIBM" gl_FUNC_ILOGB_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_ilogb_works" in *yes) ;; *) REPLACE_ILOGB=1 ;; diff --git a/m4/ilogbf.m4 b/m4/ilogbf.m4 index 00fd5a70d7..780480799b 100644 --- a/m4/ilogbf.m4 +++ b/m4/ilogbf.m4 @@ -1,4 +1,4 @@ -# ilogbf.m4 serial 7 +# ilogbf.m4 serial 8 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,10 +15,10 @@ AC_DEFUN([gl_FUNC_ILOGBF], gl_MATHFUNC([ilogbf], [int], [(float)]) if test $gl_cv_func_ilogbf_no_libm = yes \ || test $gl_cv_func_ilogbf_in_libm = yes; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ILOGBF_LIBM" gl_FUNC_ILOGBF_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_ilogbf_works" in *yes) ;; *) REPLACE_ILOGBF=1 ;; diff --git a/m4/ilogbl.m4 b/m4/ilogbl.m4 index 5ce9086aa8..9615ac26f5 100644 --- a/m4/ilogbl.m4 +++ b/m4/ilogbl.m4 @@ -1,4 +1,4 @@ -# ilogbl.m4 serial 7 +# ilogbl.m4 serial 8 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_ILOGBL], dnl Test whether ilogbl() exists. Assume that ilogbl(), if it exists, is dnl defined in the same library as ilogb(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ILOGB_LIBM" AC_CACHE_CHECK([for ilogbl], [gl_cv_func_ilogbl], @@ -33,13 +33,13 @@ AC_DEFUN([gl_FUNC_ILOGBL], [gl_cv_func_ilogbl=yes], [gl_cv_func_ilogbl=no]) ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $gl_cv_func_ilogbl = yes; then ILOGBL_LIBM="$ILOGB_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ILOGBL_LIBM" gl_FUNC_ILOGBL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_ilogbl_works" in *yes) ;; *) REPLACE_ILOGBL=1 ;; diff --git a/m4/include_next.m4 b/m4/include_next.m4 index 8a1c52c856..70cb746f43 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,4 +1,4 @@ -# include_next.m4 serial 26 +# include_next.m4 serial 27 dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -74,17 +74,17 @@ EOF #endif #define DEFINED_IN_CONFTESTD2 EOF - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" + gl_saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1b -Iconftestd2" dnl We intentionally avoid using AC_LANG_SOURCE here. AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include ]], [gl_cv_have_include_next=yes], - [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" + [CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1a -Iconftestd2" AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include ]], [gl_cv_have_include_next=buggy], [gl_cv_have_include_next=no]) ]) - CPPFLAGS="$gl_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" rm -rf conftestd1a conftestd1b conftestd2 ]) PRAGMA_SYSTEM_HEADER= diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4 index bb12bb82cc..63a9dc7505 100644 --- a/m4/inet_ntop.m4 +++ b/m4/inet_ntop.m4 @@ -1,4 +1,4 @@ -# inet_ntop.m4 serial 21 +# inet_ntop.m4 serial 22 dnl Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -36,14 +36,14 @@ AC_DEFUN([gl_FUNC_INET_NTOP], HAVE_DECL_INET_NTOP=0 fi else - gl_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS AC_SEARCH_LIBS([inet_ntop], [nsl resolv network], [], [AC_CHECK_FUNCS([inet_ntop]) if test $ac_cv_func_inet_ntop = no; then HAVE_INET_NTOP=0 fi ]) - LIBS=$gl_save_LIBS + LIBS=$gl_saved_LIBS if test "$ac_cv_search_inet_ntop" != "no" \ && test "$ac_cv_search_inet_ntop" != "none required"; then diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4 index 2035feac7e..1e0be3305a 100644 --- a/m4/inet_pton.m4 +++ b/m4/inet_pton.m4 @@ -1,4 +1,4 @@ -# inet_pton.m4 serial 19 +# inet_pton.m4 serial 20 dnl Copyright (C) 2006, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -36,14 +36,14 @@ AC_DEFUN([gl_FUNC_INET_PTON], HAVE_DECL_INET_PTON=0 fi else - gl_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS AC_SEARCH_LIBS([inet_pton], [nsl resolv network], [], [AC_CHECK_FUNCS([inet_pton]) if test $ac_cv_func_inet_pton = no; then HAVE_INET_PTON=0 fi ]) - LIBS=$gl_save_LIBS + LIBS=$gl_saved_LIBS if test "$ac_cv_search_inet_pton" != "no" \ && test "$ac_cv_search_inet_pton" != "none required"; then diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index 8ea4d1e37a..450eb8898a 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,4 +1,4 @@ -# intlmacosx.m4 serial 9 (gettext-0.22.3) +# intlmacosx.m4 serial 10 (gettext-0.23) dnl Copyright (C) 2004-2014, 2016, 2019-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ AC_DEFUN([gt_INTL_MACOSX], dnl Check for API introduced in Mac OS X 10.4. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], [gt_cv_func_CFPreferencesCopyAppValue], - [gt_save_LIBS="$LIBS" + [gt_saved_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -28,7 +28,7 @@ AC_DEFUN([gt_INTL_MACOSX], [[CFPreferencesCopyAppValue(NULL, NULL)]])], [gt_cv_func_CFPreferencesCopyAppValue=yes], [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) + LIBS="$gt_saved_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) @@ -43,7 +43,7 @@ AC_DEFUN([gt_INTL_MACOSX], dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the dnl first among the preferred languages and CC is the territory. AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages], - [gt_save_LIBS="$LIBS" + [gt_saved_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -51,7 +51,7 @@ AC_DEFUN([gt_INTL_MACOSX], [[CFLocaleCopyPreferredLanguages();]])], [gt_cv_func_CFLocaleCopyPreferredLanguages=yes], [gt_cv_func_CFLocaleCopyPreferredLanguages=no]) - LIBS="$gt_save_LIBS"]) + LIBS="$gt_saved_LIBS"]) if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1], [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.]) diff --git a/m4/isnand.m4 b/m4/isnand.m4 index 8cd04903f0..c6a54f2fd1 100644 --- a/m4/isnand.m4 +++ b/m4/isnand.m4 @@ -1,4 +1,4 @@ -# isnand.m4 serial 13 +# isnand.m4 serial 14 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -52,7 +52,7 @@ AC_DEFUN([gl_HAVE_ISNAND_IN_LIBM], AC_CACHE_CHECK([whether isnan(double) can be used with libm], [gl_cv_func_isnand_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -68,7 +68,7 @@ AC_DEFUN([gl_HAVE_ISNAND_IN_LIBM], [[return isnand (x);]])], [gl_cv_func_isnand_in_libm=yes], [gl_cv_func_isnand_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) ]) diff --git a/m4/isnanf.m4 b/m4/isnanf.m4 index 689fb621a8..a53519e700 100644 --- a/m4/isnanf.m4 +++ b/m4/isnanf.m4 @@ -1,4 +1,4 @@ -# isnanf.m4 serial 20 +# isnanf.m4 serial 21 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,10 +19,10 @@ AC_DEFUN([gl_FUNC_ISNANF], fi dnl The variable gl_func_isnanf set here is used by isnan.m4. if test $gl_cv_func_isnanf_no_libm = yes || test -n "$ISNANF_LIBM"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ISNANF_LIBM" gl_ISNANF_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_isnanf_works" in *yes) gl_func_isnanf=yes ;; *) gl_func_isnanf=no; ISNANF_LIBM= ;; @@ -93,7 +93,7 @@ AC_DEFUN([gl_HAVE_ISNANF_IN_LIBM], AC_CACHE_CHECK([whether isnan(float) can be used with libm], [gl_cv_func_isnanf_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -109,7 +109,7 @@ AC_DEFUN([gl_HAVE_ISNANF_IN_LIBM], [[return isnanf (x);]])], [gl_cv_func_isnanf_in_libm=yes], [gl_cv_func_isnanf_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) ]) diff --git a/m4/isnanl.m4 b/m4/isnanl.m4 index f0a30c0a56..b04d9bc984 100644 --- a/m4/isnanl.m4 +++ b/m4/isnanl.m4 @@ -1,4 +1,4 @@ -# isnanl.m4 serial 24 +# isnanl.m4 serial 25 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -17,10 +17,10 @@ AC_DEFUN([gl_FUNC_ISNANL], fi dnl The variable gl_func_isnanl set here is used by isnan.m4. if test $gl_cv_func_isnanl_no_libm = yes || test -n "$ISNANL_LIBM"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ISNANL_LIBM" gl_FUNC_ISNANL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_isnanl_works" in *yes) gl_func_isnanl=yes ;; *) gl_func_isnanl=no; ISNANL_LIBM= ;; @@ -87,7 +87,7 @@ AC_DEFUN([gl_HAVE_ISNANL_IN_LIBM], AC_CACHE_CHECK([whether isnan(long double) can be used with libm], [gl_cv_func_isnanl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -103,7 +103,7 @@ AC_DEFUN([gl_HAVE_ISNANL_IN_LIBM], [[return isnanl (x);]])], [gl_cv_func_isnanl_in_libm=yes], [gl_cv_func_isnanl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) ]) diff --git a/m4/javaexec.m4 b/m4/javaexec.m4 index ae84447e8c..9523b55f77 100644 --- a/m4/javaexec.m4 +++ b/m4/javaexec.m4 @@ -1,4 +1,4 @@ -# javaexec.m4 serial 10 +# javaexec.m4 serial 11 dnl Copyright (C) 2001-2003, 2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,7 @@ AC_DEFUN([gt_JAVAEXEC], popdef([AC_CHECKING])dnl popdef([AC_MSG_CHECKING])dnl m4_if([$1], , , [ - save_CLASSPATH="$CLASSPATH" + gt_saved_CLASSPATH="$CLASSPATH" CLASSPATH="$2"${CLASSPATH+"$CLASSPATH_SEPARATOR$CLASSPATH"} ]) export CLASSPATH @@ -60,7 +60,7 @@ AC_DEFUN([gt_JAVAEXEC], fi fi m4_if([$1], , , [ - CLASSPATH="$save_CLASSPATH" + CLASSPATH="$gt_saved_CLASSPATH" ]) fi if test -n "$HAVE_JAVAEXEC"; then diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4 index 1bfa2c2769..041b233acc 100644 --- a/m4/ld-version-script.m4 +++ b/m4/ld-version-script.m4 @@ -1,4 +1,4 @@ -# ld-version-script.m4 serial 6 +# ld-version-script.m4 serial 7 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,7 +24,7 @@ AC_DEFUN([gl_LD_VERSION_SCRIPT], [AC_CACHE_CHECK([if LD -Wl,--version-script works], [gl_cv_sys_ld_version_script], [gl_cv_sys_ld_version_script=no - save_LDFLAGS=$LDFLAGS + saved_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" echo foo >conftest.map AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], @@ -41,7 +41,7 @@ EOF AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [gl_cv_sys_ld_version_script=yes])]) rm -f conftest.map - LDFLAGS=$save_LDFLAGS]) + LDFLAGS=$saved_LDFLAGS]) have_ld_version_script=$gl_cv_sys_ld_version_script]) AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], [test "$have_ld_version_script" = yes]) diff --git a/m4/ldexp.m4 b/m4/ldexp.m4 index cfa9894a57..4950d690b9 100644 --- a/m4/ldexp.m4 +++ b/m4/ldexp.m4 @@ -1,4 +1,4 @@ -# ldexp.m4 serial 2 +# ldexp.m4 serial 3 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_LDEXP], AC_CACHE_CHECK([whether ldexp() can be used with libm], [gl_cv_func_ldexp_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM([[#ifndef __NO_MATH_INLINES @@ -27,17 +27,17 @@ AC_DEFUN([gl_FUNC_LDEXP], [[return ldexp (x, -1) > 0;]])], [gl_cv_func_ldexp_in_libm=yes], [gl_cv_func_ldexp_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_ldexp_in_libm = yes; then LDEXP_LIBM=-lm fi fi - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LDEXP_LIBM" gl_FUNC_LDEXP_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_ldexp_works" in *yes) ;; *) REPLACE_LDEXP=1 ;; diff --git a/m4/ldexpl.m4 b/m4/ldexpl.m4 index 7e7a4addb1..92fa523c0f 100644 --- a/m4/ldexpl.m4 +++ b/m4/ldexpl.m4 @@ -1,4 +1,4 @@ -# ldexpl.m4 serial 18 +# ldexpl.m4 serial 19 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_LDEXPL], AC_CACHE_CHECK([whether ldexpl() can be used with libm], [gl_cv_func_ldexpl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_LDEXPL], [[return ldexpl (x, -1) > 0;]])], [gl_cv_func_ldexpl_in_libm=yes], [gl_cv_func_ldexpl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_ldexpl_in_libm = yes; then LDEXPL_LIBM=-lm @@ -41,10 +41,10 @@ AC_DEFUN([gl_FUNC_LDEXPL], fi if test $gl_cv_func_ldexpl_no_libm = yes \ || test $gl_cv_func_ldexpl_in_libm = yes; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LDEXPL_LIBM" gl_FUNC_LDEXPL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_ldexpl_works" in *yes) gl_func_ldexpl=yes ;; *) gl_func_ldexpl=no; REPLACE_LDEXPL=1 ;; diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index f0793329da..b17e0fda43 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,4 +1,4 @@ -# lib-ld.m4 serial 12 +# lib-ld.m4 serial 13 dnl Copyright (C) 1996-2003, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -97,9 +97,9 @@ else fi if test -n "$ac_prog"; then # Search for $ac_prog in $PATH. - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$acl_save_ifs" + IFS="$acl_saved_IFS" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" @@ -116,7 +116,7 @@ else esac fi done - IFS="$acl_save_ifs" + IFS="$acl_saved_IFS" fi case $host in *-*-aix*) diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index d91ecb3ae1..1a7c12732c 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 33 +# lib-link.m4 serial 34 dnl Copyright (C) 2001-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -69,11 +69,11 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, dnl because if the user has installed lib[]Name and not disabled its use dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" + acl_saved_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" + acl_saved_LIBS="$LIBS" dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, dnl because these -l options might require -L options that are present in dnl LIBS. -l options benefit only from the -L options listed before it. @@ -89,7 +89,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [AC_LANG_PROGRAM([[$3]], [[$4]])], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) - LIBS="$ac_save_LIBS" + LIBS="$acl_saved_LIBS" ]) if test "$ac_cv_lib[]Name" = yes; then HAVE_LIB[]NAME=yes @@ -100,7 +100,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], HAVE_LIB[]NAME=no dnl If $LIB[]NAME didn't lead to a usable library, we don't need dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" + CPPFLAGS="$acl_saved_CPPFLAGS" LIB[]NAME= LTLIB[]NAME= LIB[]NAME[]_PREFIX= @@ -537,12 +537,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl Read the .la file. It defines the variables dnl dlname, library_names, old_library, dependency_libs, current, dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" + saved_libdir="$libdir" case "$found_la" in */* | *\\*) . "$found_la" ;; *) . "./$found_la" ;; esac - libdir="$save_libdir" + libdir="$saved_libdir" dnl We use only dependency_libs. for dep in $dependency_libs; do case "$dep" in @@ -682,18 +682,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" else dnl The -rpath options are cumulative. for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$found_dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" done fi @@ -790,18 +790,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], for dir in $rpathdirs; do alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" done - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$alldirs" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" $1="$flag" else dnl The -rpath options are cumulative. for dir in $rpathdirs; do - acl_save_libdir="$libdir" + acl_saved_libdir="$libdir" libdir="$dir" eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" + libdir="$acl_saved_libdir" $1="${$1}${$1:+ }$flag" done fi diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index d597553b58..0c6f96ca68 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,4 +1,4 @@ -# lib-prefix.m4 serial 20 +# lib-prefix.m4 serial 21 dnl Copyright (C) 2001-2005, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -126,10 +126,10 @@ AC_DEFUN([AC_LIB_PREPARE_PREFIX], else acl_final_exec_prefix="$exec_prefix" fi - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" + prefix="$acl_saved_prefix" ]) dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the @@ -137,13 +137,13 @@ dnl variables prefix and exec_prefix bound to the values they will have dnl at the end of the configure script. AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], [ - acl_save_prefix="$prefix" + acl_saved_prefix="$prefix" prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" + acl_saved_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + exec_prefix="$acl_saved_exec_prefix" + prefix="$acl_saved_prefix" ]) dnl AC_LIB_PREPARE_MULTILIB creates @@ -280,7 +280,7 @@ changequote([,])dnl fi fi if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" + acl_saved_IFS="${IFS= }"; IFS=":" for searchdir in $searchpath; do if test -d "$searchdir"; then case "$searchdir" in @@ -297,7 +297,7 @@ changequote([,])dnl esac fi done - IFS="$acl_save_IFS" + IFS="$acl_saved_IFS" if test $HOST_CPU_C_ABI_32BIT = yes; then # 32-bit ABI. acl_libdirstem3= diff --git a/m4/libunistring.m4 b/m4/libunistring.m4 index 3aba2c25ed..1d35b33112 100644 --- a/m4/libunistring.m4 +++ b/m4/libunistring.m4 @@ -1,4 +1,4 @@ -# libunistring.m4 serial 12 +# libunistring.m4 serial 13 dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -73,7 +73,7 @@ AC_DEFUN([gl_LIBUNISTRING_CORE], dnl We have to erase the cached result of the first AC_LIB_HAVE_LINKFLAGS dnl invocation, otherwise the second one will not be run. unset ac_cv_libunistring - glus_save_LIBS="$LIBS" + glus_saved_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" AC_LIB_HAVE_LINKFLAGS([unistring], [], [#include ], [u8_strconv_from_locale((char*)0);], @@ -82,7 +82,7 @@ AC_DEFUN([gl_LIBUNISTRING_CORE], LIBUNISTRING="$LIBUNISTRING $LIBICONV" LTLIBUNISTRING="$LTLIBUNISTRING $LTLIBICONV" fi - LIBS="$glus_save_LIBS" + LIBS="$glus_saved_LIBS" fi else AC_LIB_HAVE_LINKFLAGS([unistring], [], diff --git a/m4/log.m4 b/m4/log.m4 index b62355abc8..2141d59241 100644 --- a/m4/log.m4 +++ b/m4/log.m4 @@ -1,4 +1,4 @@ -# log.m4 serial 13 +# log.m4 serial 14 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,10 +12,10 @@ AC_DEFUN([gl_FUNC_LOG], dnl Determine LOG_LIBM. gl_COMMON_DOUBLE_MATHFUNC([log]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG_LIBM" gl_FUNC_LOG_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_log_works" in *yes) ;; *) REPLACE_LOG=1 ;; @@ -27,7 +27,7 @@ AC_DEFUN([gl_FUNC_LOG], AC_CACHE_CHECK([whether log works according to ISO C 99 with IEC 60559], [gl_cv_func_log_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -68,7 +68,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_log_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_log_ieee" in *yes) ;; diff --git a/m4/log10.m4 b/m4/log10.m4 index 6e6e544d46..56736e6721 100644 --- a/m4/log10.m4 +++ b/m4/log10.m4 @@ -1,4 +1,4 @@ -# log10.m4 serial 13 +# log10.m4 serial 14 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,10 +12,10 @@ AC_DEFUN([gl_FUNC_LOG10], dnl Determine LOG10_LIBM. gl_COMMON_DOUBLE_MATHFUNC([log10]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG10_LIBM" gl_FUNC_LOG10_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_log10_works" in *yes) ;; *) REPLACE_LOG10=1 ;; @@ -27,7 +27,7 @@ AC_DEFUN([gl_FUNC_LOG10], AC_CACHE_CHECK([whether log10 works according to ISO C 99 with IEC 60559], [gl_cv_func_log10_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG10_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -68,7 +68,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_log10_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_log10_ieee" in *yes) ;; diff --git a/m4/log10f.m4 b/m4/log10f.m4 index de2beb86bd..49d305119c 100644 --- a/m4/log10f.m4 +++ b/m4/log10f.m4 @@ -1,4 +1,4 @@ -# log10f.m4 serial 14 +# log10f.m4 serial 15 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,17 +15,17 @@ AC_DEFUN([gl_FUNC_LOG10F], dnl Test whether log10f() exists. Assume that log10f(), if it exists, is dnl defined in the same library as log10(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG10_LIBM" AC_CHECK_FUNCS([log10f]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_log10f = yes; then LOG10F_LIBM="$LOG10_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG10F_LIBM" gl_FUNC_LOG10F_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_log10f_works" in *yes) ;; *) REPLACE_LOG10F=1 ;; @@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_LOG10F], AC_CACHE_CHECK([whether log10f works according to ISO C 99 with IEC 60559], [gl_cv_func_log10f_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG10F_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -78,7 +78,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_log10f_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_log10f_ieee" in *yes) ;; diff --git a/m4/log10l.m4 b/m4/log10l.m4 index b3efe27530..19d6145961 100644 --- a/m4/log10l.m4 +++ b/m4/log10l.m4 @@ -1,4 +1,4 @@ -# log10l.m4 serial 12 +# log10l.m4 serial 13 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,17 +18,17 @@ AC_DEFUN([gl_FUNC_LOG10L], dnl Test whether log10l() exists. Assume that log10l(), if it exists, is dnl defined in the same library as log10(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG10_LIBM" AC_CHECK_FUNCS([log10l]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_log10l = yes; then LOG10L_LIBM="$LOG10_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG10L_LIBM" gl_FUNC_LOG10L_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_log10l_works" in *yes) ;; *) REPLACE_LOG10L=1 ;; diff --git a/m4/log1p.m4 b/m4/log1p.m4 index d59a7c8dda..879e98a127 100644 --- a/m4/log1p.m4 +++ b/m4/log1p.m4 @@ -1,4 +1,4 @@ -# log1p.m4 serial 10 +# log1p.m4 serial 11 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,10 +16,10 @@ AC_DEFUN([gl_FUNC_LOG1P], gl_COMMON_DOUBLE_MATHFUNC([log1p]) dnl Test whether log1p() exists. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG1P_LIBM" AC_CHECK_FUNCS([log1p]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_log1p = yes; then : m4_ifdef([gl_FUNC_LOG1P_IEEE], [ @@ -28,7 +28,7 @@ AC_DEFUN([gl_FUNC_LOG1P], AC_CACHE_CHECK([whether log1p works according to ISO C 99 with IEC 60559], [gl_cv_func_log1p_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG1P_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -62,7 +62,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_log1p_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_log1p_ieee" in *yes) ;; diff --git a/m4/log1pf.m4 b/m4/log1pf.m4 index 03b13519dd..d46cf10b3e 100644 --- a/m4/log1pf.m4 +++ b/m4/log1pf.m4 @@ -1,4 +1,4 @@ -# log1pf.m4 serial 10 +# log1pf.m4 serial 11 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,17 +15,17 @@ AC_DEFUN([gl_FUNC_LOG1PF], dnl Test whether log1pf() exists. Assume that log1pf(), if it exists, is dnl defined in the same library as log1p(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG1P_LIBM" AC_CHECK_FUNCS([log1pf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_log1pf = yes; then LOG1PF_LIBM="$LOG1P_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG1PF_LIBM" gl_FUNC_LOG1PF_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_log1pf_works" in *yes) ;; *) REPLACE_LOG1PF=1 ;; @@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_LOG1PF], AC_CACHE_CHECK([whether log1pf works according to ISO C 99 with IEC 60559], [gl_cv_func_log1pf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG1PF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -71,7 +71,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_log1pf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_log1pf_ieee" in *yes) ;; diff --git a/m4/log1pl.m4 b/m4/log1pl.m4 index ed24f0bbc0..7cb636c46f 100644 --- a/m4/log1pl.m4 +++ b/m4/log1pl.m4 @@ -1,4 +1,4 @@ -# log1pl.m4 serial 11 +# log1pl.m4 serial 12 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,17 +16,17 @@ AC_DEFUN([gl_FUNC_LOG1PL], dnl Test whether log1pl() exists. Assume that log1pl(), if it exists, is dnl defined in the same library as log1p(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG1P_LIBM" AC_CHECK_FUNCS([log1pl]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_log1pl = yes; then LOG1PL_LIBM="$LOG1P_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG1PL_LIBM" gl_FUNC_LOG1PL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_log1pl_works" in *yes) ;; *) REPLACE_LOG1PL=1 ;; @@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_LOG1PL], AC_CACHE_CHECK([whether log1pl works according to ISO C 99 with IEC 60559], [gl_cv_func_log1pl_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG1PL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -72,7 +72,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_log1pl_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_log1pl_ieee" in *yes) ;; diff --git a/m4/log2.m4 b/m4/log2.m4 index 38afcd2301..aa5b6b60b7 100644 --- a/m4/log2.m4 +++ b/m4/log2.m4 @@ -1,4 +1,4 @@ -# log2.m4 serial 14 +# log2.m4 serial 15 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,20 +16,20 @@ AC_DEFUN([gl_FUNC_LOG2], gl_COMMON_DOUBLE_MATHFUNC([log2]) dnl Test whether log2() exists. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG2_LIBM" gl_CHECK_FUNCS_ANDROID([log2], [[#include ]]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_log2 = yes; then HAVE_LOG2=1 dnl Also check whether it's declared. dnl IRIX 6.5 has log2() in libm but doesn't declare it in . AC_CHECK_DECL([log2], , [HAVE_DECL_LOG2=0], [[#include ]]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG2_LIBM" gl_FUNC_LOG2_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_log2_works" in *yes) ;; *) REPLACE_LOG2=1 ;; @@ -41,7 +41,7 @@ AC_DEFUN([gl_FUNC_LOG2], AC_CACHE_CHECK([whether log2 works according to ISO C 99 with IEC 60559], [gl_cv_func_log2_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG2_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -89,7 +89,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_log2_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_log2_ieee" in *yes) ;; diff --git a/m4/log2f.m4 b/m4/log2f.m4 index a96c6bf4d9..16bc58f891 100644 --- a/m4/log2f.m4 +++ b/m4/log2f.m4 @@ -1,4 +1,4 @@ -# log2f.m4 serial 14 +# log2f.m4 serial 15 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -17,20 +17,20 @@ AC_DEFUN([gl_FUNC_LOG2F], gl_COMMON_DOUBLE_MATHFUNC([log2f]) dnl Test whether log2f() exists. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG2F_LIBM" gl_CHECK_FUNCS_ANDROID([log2f], [[#include ]]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_log2f = yes; then HAVE_LOG2F=1 dnl Also check whether it's declared. dnl IRIX 6.5 has log2f() in libm but doesn't declare it in . AC_CHECK_DECL([log2f], , [HAVE_DECL_LOG2F=0], [[#include ]]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG2F_LIBM" gl_FUNC_LOG2F_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_log2f_works" in *yes) ;; *) REPLACE_LOG2F=1 ;; @@ -42,7 +42,7 @@ AC_DEFUN([gl_FUNC_LOG2F], AC_CACHE_CHECK([whether log2f works according to ISO C 99 with IEC 60559], [gl_cv_func_log2f_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG2F_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -90,7 +90,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_log2f_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_log2f_ieee" in *yes) ;; diff --git a/m4/log2l.m4 b/m4/log2l.m4 index ec85406589..31d5432664 100644 --- a/m4/log2l.m4 +++ b/m4/log2l.m4 @@ -1,4 +1,4 @@ -# log2l.m4 serial 7 +# log2l.m4 serial 8 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,10 +15,10 @@ AC_DEFUN([gl_FUNC_LOG2L], dnl Test whether log2l() exists. Assume that log2l(), if it exists, is dnl defined in the same library as log2(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG2_LIBM" gl_CHECK_FUNCS_ANDROID([log2l], [[#include ]]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_log2l = yes; then LOG2L_LIBM="$LOG2_LIBM" HAVE_LOG2L=1 @@ -26,10 +26,10 @@ AC_DEFUN([gl_FUNC_LOG2L], dnl IRIX 6.5 has log2l() in libm but doesn't declare it in . AC_CHECK_DECL([log2l], , [HAVE_DECL_LOG2L=0], [[#include ]]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG2L_LIBM" gl_FUNC_LOG2L_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_log2l_works" in *yes) ;; *) REPLACE_LOG2L=1 ;; diff --git a/m4/logb.m4 b/m4/logb.m4 index 588546d726..ede6e512a0 100644 --- a/m4/logb.m4 +++ b/m4/logb.m4 @@ -1,4 +1,4 @@ -# logb.m4 serial 10 +# logb.m4 serial 11 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_LOGB], [[x = logb(x);]])], [LOGB_LIBM=]) if test "$LOGB_LIBM" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -49,14 +49,14 @@ AC_DEFUN([gl_FUNC_LOGB], double x;]], [[x = logb(x);]])], [LOGB_LIBM="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi if test "$LOGB_LIBM" != "?"; then HAVE_LOGB=1 - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOGB_LIBM" gl_FUNC_LOGB_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_logb_works" in *yes) ;; *) REPLACE_LOGB=1 ;; diff --git a/m4/logbf.m4 b/m4/logbf.m4 index ae8745bf5f..86ef214d05 100644 --- a/m4/logbf.m4 +++ b/m4/logbf.m4 @@ -1,4 +1,4 @@ -# logbf.m4 serial 5 +# logbf.m4 serial 6 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,10 +15,10 @@ AC_DEFUN([gl_FUNC_LOGBF], gl_MATHFUNC([logbf], [float], [(float)]) if test $gl_cv_func_logbf_no_libm = yes \ || test $gl_cv_func_logbf_in_libm = yes; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOGBF_LIBM" gl_FUNC_LOGBF_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_logbf_works" in *yes) ;; *) REPLACE_LOGBF=1 ;; diff --git a/m4/logbl.m4 b/m4/logbl.m4 index da84350043..337da27271 100644 --- a/m4/logbl.m4 +++ b/m4/logbl.m4 @@ -1,4 +1,4 @@ -# logbl.m4 serial 7 +# logbl.m4 serial 8 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,10 +19,10 @@ AC_DEFUN([gl_FUNC_LOGBL], gl_MATHFUNC([logbl], [long double], [(long double)]) if test $gl_cv_func_logbl_no_libm = yes \ || test $gl_cv_func_logbl_in_libm = yes; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOGBL_LIBM" gl_FUNC_LOGBL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_logbl_works" in *yes) ;; *) REPLACE_LOGBL=1 ;; diff --git a/m4/logf.m4 b/m4/logf.m4 index 6acd27b7e0..fe2de2fae7 100644 --- a/m4/logf.m4 +++ b/m4/logf.m4 @@ -1,4 +1,4 @@ -# logf.m4 serial 14 +# logf.m4 serial 15 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,17 +15,17 @@ AC_DEFUN([gl_FUNC_LOGF], dnl Test whether logf() exists. Assume that logf(), if it exists, is dnl defined in the same library as log(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOG_LIBM" AC_CHECK_FUNCS([logf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_logf = yes; then LOGF_LIBM="$LOG_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOGF_LIBM" gl_FUNC_LOGF_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_logf_works" in *yes) ;; *) REPLACE_LOGF=1 ;; @@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_LOGF], AC_CACHE_CHECK([whether logf works according to ISO C 99 with IEC 60559], [gl_cv_func_logf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOGF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -78,7 +78,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_logf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_logf_ieee" in *yes) ;; diff --git a/m4/logl.m4 b/m4/logl.m4 index ba82bb460d..5e1bb3f1a9 100644 --- a/m4/logl.m4 +++ b/m4/logl.m4 @@ -1,4 +1,4 @@ -# logl.m4 serial 17 +# logl.m4 serial 18 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_LOGL], AC_CACHE_CHECK([whether logl() can be used with libm], [gl_cv_func_logl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_LOGL], || logl (x) > 1;]])], [gl_cv_func_logl_in_libm=yes], [gl_cv_func_logl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_logl_in_libm = yes; then LOGL_LIBM=-lm @@ -58,10 +58,10 @@ AC_DEFUN([gl_FUNC_LOGL], dnl Also check whether it's declared. dnl Mac OS X 10.3 has logl() in libc but doesn't declare it in . AC_CHECK_DECL([logl], , [HAVE_DECL_LOGL=0], [[#include ]]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $LOGL_LIBM" gl_FUNC_LOGL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_logl_works" in *yes) ;; *) REPLACE_LOGL=1 ;; diff --git a/m4/manywarnings-c++.m4 b/m4/manywarnings-c++.m4 index aa6a31cbe5..f091b3a826 100644 --- a/m4/manywarnings-c++.m4 +++ b/m4/manywarnings-c++.m4 @@ -1,4 +1,4 @@ -# manywarnings-c++.m4 serial 3 +# manywarnings-c++.m4 serial 4 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,13 +19,13 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC_CXX_IMPL], dnl with the current $CXX $CXXFLAGS $CPPFLAGS. AC_CACHE_CHECK([whether -Wno-missing-field-initializers is supported], [gl_cv_cxx_nomfi_supported], - [gl_save_CXXFLAGS="$CXXFLAGS" + [gl_saved_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -W -Werror -Wno-missing-field-initializers" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[]], [[]])], [gl_cv_cxx_nomfi_supported=yes], [gl_cv_cxx_nomfi_supported=no]) - CXXFLAGS="$gl_save_CXXFLAGS" + CXXFLAGS="$gl_saved_CXXFLAGS" ]) if test "$gl_cv_cxx_nomfi_supported" = yes; then @@ -33,7 +33,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC_CXX_IMPL], dnl for the { 0, } construct. AC_CACHE_CHECK([whether -Wno-missing-field-initializers is needed], [gl_cv_cxx_nomfi_needed], - [gl_save_CXXFLAGS="$CXXFLAGS" + [gl_saved_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -W -Werror" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC_CXX_IMPL], [[]])], [gl_cv_cxx_nomfi_needed=no], [gl_cv_cxx_nomfi_needed=yes]) - CXXFLAGS="$gl_save_CXXFLAGS" + CXXFLAGS="$gl_saved_CXXFLAGS" ]) fi @@ -56,13 +56,13 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC_CXX_IMPL], dnl has no effect if -O is not also used AC_CACHE_CHECK([whether -Wuninitialized is supported], [gl_cv_cxx_uninitialized_supported], - [gl_save_CXXFLAGS="$CXXFLAGS" + [gl_saved_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -Werror -Wuninitialized" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[]], [[]])], [gl_cv_cxx_uninitialized_supported=yes], [gl_cv_cxx_uninitialized_supported=no]) - CXXFLAGS="$gl_save_CXXFLAGS" + CXXFLAGS="$gl_saved_CXXFLAGS" ]) fi diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 index 4d44f3aa34..3c6795ceb2 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -1,4 +1,4 @@ -# manywarnings.m4 serial 24 +# manywarnings.m4 serial 25 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -52,7 +52,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)], AC_CACHE_CHECK([whether -Wno-missing-field-initializers is needed], [gl_cv_cc_nomfi_needed], [gl_cv_cc_nomfi_needed=no - gl_save_CFLAGS="$CFLAGS" + gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wextra -Werror" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -71,7 +71,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)], [CFLAGS="$CFLAGS -Wno-missing-field-initializers" AC_COMPILE_IFELSE([], [gl_cv_cc_nomfi_needed=yes])]) - CFLAGS="$gl_save_CFLAGS" + CFLAGS="$gl_saved_CFLAGS" ]) dnl Next, check if -Werror -Wuninitialized is useful with the @@ -79,13 +79,13 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)], dnl has no effect if -O is not also used AC_CACHE_CHECK([whether -Wuninitialized is supported], [gl_cv_cc_uninitialized_supported], - [gl_save_CFLAGS="$CFLAGS" + [gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror -Wuninitialized" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[]], [[]])], [gl_cv_cc_uninitialized_supported=yes], [gl_cv_cc_uninitialized_supported=no]) - CFLAGS="$gl_save_CFLAGS" + CFLAGS="$gl_saved_CFLAGS" ]) ]) diff --git a/m4/mathfunc.m4 b/m4/mathfunc.m4 index 1110a526a7..93777a7148 100644 --- a/m4/mathfunc.m4 +++ b/m4/mathfunc.m4 @@ -1,4 +1,4 @@ -# mathfunc.m4 serial 17 +# mathfunc.m4 serial 18 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -85,7 +85,7 @@ AC_DEFUN([gl_MATHFUNC], AC_CACHE_CHECK([whether func() can be used with libm], [gl_cv_func_]func[_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -105,7 +105,7 @@ AC_DEFUN([gl_MATHFUNC], ]])], [gl_cv_func_]func[_in_libm=yes], [gl_cv_func_]func[_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_[]func[]_in_libm = yes; then FUNC[]_LIBM=-lm diff --git a/m4/modf.m4 b/m4/modf.m4 index 167869d6bb..860f618b17 100644 --- a/m4/modf.m4 +++ b/m4/modf.m4 @@ -1,4 +1,4 @@ -# modf.m4 serial 12 +# modf.m4 serial 13 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_MODF], AC_CACHE_CHECK([whether modf works according to ISO C 99 with IEC 60559], [gl_cv_func_modf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $MODF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -79,7 +79,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_modf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_modf_ieee" in *yes) ;; diff --git a/m4/modff.m4 b/m4/modff.m4 index 20831f4598..274edd9fb7 100644 --- a/m4/modff.m4 +++ b/m4/modff.m4 @@ -1,4 +1,4 @@ -# modff.m4 serial 14 +# modff.m4 serial 15 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_MODFF], AC_CACHE_CHECK([whether modff works according to ISO C 99 with IEC 60559], [gl_cv_func_modff_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $MODFF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -87,7 +87,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_modff_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_modff_ieee" in *yes) ;; diff --git a/m4/modfl.m4 b/m4/modfl.m4 index 13116aaa92..b205f9f5a5 100644 --- a/m4/modfl.m4 +++ b/m4/modfl.m4 @@ -1,4 +1,4 @@ -# modfl.m4 serial 11 +# modfl.m4 serial 12 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_MODFL], AC_CACHE_CHECK([whether modfl works according to ISO C 99 with IEC 60559], [gl_cv_func_modfl_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $MODFL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -81,7 +81,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_modfl_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_modfl_ieee" in *yes) ;; diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 2302d2d916..c51f590402 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,4 +1,4 @@ -# serial 45 +# serial 46 dnl From Jim Meyering. dnl Check for the nanosleep function. @@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], AC_CHECK_DECLS_ONCE([alarm]) - nanosleep_save_libs=$LIBS + gl_saved_LIBS=$LIBS # Solaris 2.5.1 needs -lposix4 to get the nanosleep function. # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. @@ -143,7 +143,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], else HAVE_NANOSLEEP=0 fi - LIBS=$nanosleep_save_libs + LIBS=$gl_saved_LIBS # For backward compatibility. LIB_NANOSLEEP="$NANOSLEEP_LIB" diff --git a/m4/powf.m4 b/m4/powf.m4 index 36a2184200..1e41337a27 100644 --- a/m4/powf.m4 +++ b/m4/powf.m4 @@ -1,4 +1,4 @@ -# powf.m4 serial 2 +# powf.m4 serial 3 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_POWF], dnl Test whether powf() exists. Assume that powf(), if it exists, is dnl defined in the same library as pow(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $POW_LIBM" AC_CHECK_FUNCS([powf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_powf = yes; then POWF_LIBM="$POW_LIBM" else diff --git a/m4/pread.m4 b/m4/pread.m4 index 123affd3dc..c386a11faa 100644 --- a/m4/pread.m4 +++ b/m4/pread.m4 @@ -1,4 +1,4 @@ -# pread.m4 serial 8 +# pread.m4 serial 9 dnl Copyright (C) 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -29,7 +29,7 @@ changequote(,)dnl *) gl_cv_func_pread_works="guessing yes" ;; esac changequote([,])dnl - gl_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" AC_RUN_IFELSE( [AC_LANG_PROGRAM([[ @@ -73,7 +73,7 @@ changequote([,])dnl [gl_cv_func_pread_works=yes], [gl_cv_func_pread_works=no], [:]) - CPPFLAGS="$gl_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" ]) case "$gl_cv_func_pread_works" in *yes) ;; diff --git a/m4/progtest.m4 b/m4/progtest.m4 index e13c488d07..8dd4d606d9 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,4 +1,4 @@ -# progtest.m4 serial 9 (gettext-0.21.1) +# progtest.m4 serial 10 (gettext-0.23) dnl Copyright (C) 1996-2003, 2005, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -60,9 +60,9 @@ AC_CACHE_VAL([ac_cv_path_$1], ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in m4_if([$5], , $PATH, [$5]); do - IFS="$ac_save_IFS" + IFS="$gt_saved_IFS" test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then @@ -74,7 +74,7 @@ AC_CACHE_VAL([ac_cv_path_$1], fi done done - IFS="$ac_save_IFS" + IFS="$gt_saved_IFS" dnl If no 4th arg is given, leave the cache variable unset, dnl so AC_PATH_PROGS will keep looking. m4_if([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" diff --git a/m4/pthread-spin.m4 b/m4/pthread-spin.m4 index 71c73bfb34..daf9462b52 100644 --- a/m4/pthread-spin.m4 +++ b/m4/pthread-spin.m4 @@ -1,4 +1,4 @@ -# pthread-spin.m4 serial 4 +# pthread-spin.m4 serial 5 dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -36,7 +36,7 @@ AC_DEFUN([gl_PTHREAD_SPIN], dnl FreeBSD 5.2.1 declares them but does not define them. AC_CACHE_CHECK([for pthread_spin_init], [gl_cv_func_pthread_spin_init_in_LIBMULTITHREAD], - [gl_save_LIBS="$LIBS" + [gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -48,7 +48,7 @@ AC_DEFUN([gl_PTHREAD_SPIN], ], [gl_cv_func_pthread_spin_init_in_LIBMULTITHREAD=yes], [gl_cv_func_pthread_spin_init_in_LIBMULTITHREAD=no]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test $gl_cv_func_pthread_spin_init_in_LIBMULTITHREAD != yes; then HAVE_PTHREAD_SPIN_INIT=0 diff --git a/m4/pthread_mutex_timedlock.m4 b/m4/pthread_mutex_timedlock.m4 index e101bb96d9..1dc4c8c682 100644 --- a/m4/pthread_mutex_timedlock.m4 +++ b/m4/pthread_mutex_timedlock.m4 @@ -1,4 +1,4 @@ -# pthread_mutex_timedlock.m4 serial 3 +# pthread_mutex_timedlock.m4 serial 4 dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_MUTEX_TIMEDLOCK], dnl FreeBSD 5.2.1 declares it but does not define it. AC_CACHE_CHECK([for pthread_mutex_timedlock], [gl_cv_func_pthread_mutex_timedlock_in_LIBMULTITHREAD], - [gl_save_LIBS="$LIBS" + [gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -32,7 +32,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_MUTEX_TIMEDLOCK], ], [gl_cv_func_pthread_mutex_timedlock_in_LIBMULTITHREAD=yes], [gl_cv_func_pthread_mutex_timedlock_in_LIBMULTITHREAD=no]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test $gl_cv_func_pthread_mutex_timedlock_in_LIBMULTITHREAD != yes; then HAVE_PTHREAD_MUTEX_TIMEDLOCK=0 diff --git a/m4/pthread_rwlock_rdlock.m4 b/m4/pthread_rwlock_rdlock.m4 index 98e5f0e3d2..ddb58318df 100644 --- a/m4/pthread_rwlock_rdlock.m4 +++ b/m4/pthread_rwlock_rdlock.m4 @@ -1,4 +1,4 @@ -# pthread_rwlock_rdlock.m4 serial 7 +# pthread_rwlock_rdlock.m4 serial 8 dnl Copyright (C) 2017-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -38,7 +38,7 @@ AC_DEFUN([gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether pthread_rwlock_rdlock prefers a writer to a reader], [gl_cv_pthread_rwlock_rdlock_prefer_writer], - [save_LIBS="$LIBS" + [saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -174,7 +174,7 @@ main () *) gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in *yes) diff --git a/m4/pthread_sigmask.m4 b/m4/pthread_sigmask.m4 index 81be9611db..cb2ee90031 100644 --- a/m4/pthread_sigmask.m4 +++ b/m4/pthread_sigmask.m4 @@ -1,4 +1,4 @@ -# pthread_sigmask.m4 serial 22 +# pthread_sigmask.m4 serial 23 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], if test -n "$LIBMULTITHREAD"; then AC_CACHE_CHECK([for pthread_sigmask in $LIBMULTITHREAD], [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD], - [gl_save_LIBS="$LIBS" + [gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -58,7 +58,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], ], [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes], [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then dnl pthread_sigmask is available with -pthread or -lpthread. @@ -164,7 +164,7 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], AC_CACHE_CHECK([whether pthread_sigmask returns error numbers], [gl_cv_func_pthread_sigmask_return_works], [ - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $PTHREAD_SIGMASK_LIB" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -188,7 +188,7 @@ int main () gl_cv_func_pthread_sigmask_return_works="guessing yes";; esac ]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) case "$gl_cv_func_pthread_sigmask_return_works" in *no) @@ -214,7 +214,7 @@ int main () [dnl Link against $LIBMULTITHREAD, not only $PTHREAD_SIGMASK_LIB. dnl Otherwise we get a false positive on those platforms where dnl $gl_cv_func_pthread_sigmask_in_libc_works is "no". - gl_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS LIBS="$LIBS $LIBMULTITHREAD"]) AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -258,7 +258,7 @@ int main () [:], [gl_cv_func_pthread_sigmask_unblock_works=no], [:]) - m4_ifdef([gl_][THREADLIB], [LIBS=$gl_save_LIBS]) + m4_ifdef([gl_][THREADLIB], [LIBS=$gl_saved_LIBS]) ]) case "$gl_cv_func_pthread_sigmask_unblock_works" in *no) diff --git a/m4/pty.m4 b/m4/pty.m4 index ee1f4d6a0e..b2f5c3cf92 100644 --- a/m4/pty.m4 +++ b/m4/pty.m4 @@ -1,4 +1,4 @@ -# pty.m4 serial 19 +# pty.m4 serial 20 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,13 +15,13 @@ AC_DEFUN([gl_PTY_LIB], case "$host_os" in haiku*) PTY_LIB='-lbsd' ;; *) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" AC_SEARCH_LIBS([forkpty], [util], [if test "$ac_cv_search_forkpty" != "none required"; then PTY_LIB="$ac_cv_search_forkpty" fi ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ;; esac AC_SUBST([PTY_LIB]) diff --git a/m4/pwrite.m4 b/m4/pwrite.m4 index 346acfef89..0372cab65a 100644 --- a/m4/pwrite.m4 +++ b/m4/pwrite.m4 @@ -1,4 +1,4 @@ -# pwrite.m4 serial 8 +# pwrite.m4 serial 9 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -29,7 +29,7 @@ changequote(,)dnl *) gl_cv_func_pwrite_works="guessing yes" ;; esac changequote([,])dnl - gl_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" rm -f conftest.out AC_RUN_IFELSE( @@ -87,7 +87,7 @@ changequote([,])dnl [gl_cv_func_pwrite_works=no], [:]) rm -f conftest.out - CPPFLAGS="$gl_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" ]) case "$gl_cv_func_pwrite_works" in *yes) ;; diff --git a/m4/readline.m4 b/m4/readline.m4 index 93f6ef1bf0..624a31ffe1 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -1,4 +1,4 @@ -# readline.m4 serial 10 +# readline.m4 serial 11 dnl Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -21,19 +21,19 @@ AC_DEFUN([gl_FUNC_READLINE], dnl because if the user has installed libreadline and not disabled its use dnl via --without-libreadline-prefix, he wants to use it. The AC_LINK_IFELSE dnl will then succeed. - am_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCREADLINE]) AC_CACHE_CHECK([for readline], [gl_cv_lib_readline], [ gl_cv_lib_readline=no - am_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" dnl On some systems, -lreadline doesn't link without an additional dnl -lncurses or -ltermcap. dnl Try -lncurses before -ltermcap, because libtermcap is insecure dnl by design and obsolete since 1994. Try -lcurses last, because dnl libcurses is unusable on some old Unices. for extra_lib in "" ncurses termcap curses; do - LIBS="$am_save_LIBS $LIBREADLINE" + LIBS="$gl_saved_LIBS $LIBREADLINE" if test -n "$extra_lib"; then LIBS="$LIBS -l$extra_lib" fi @@ -50,7 +50,7 @@ AC_DEFUN([gl_FUNC_READLINE], break fi done - LIBS="$am_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_lib_readline" != no; then @@ -65,7 +65,7 @@ AC_DEFUN([gl_FUNC_READLINE], else dnl If $LIBREADLINE didn't lead to a usable library, we don't dnl need $INCREADLINE either. - CPPFLAGS="$am_save_CPPFLAGS" + CPPFLAGS="$gl_saved_CPPFLAGS" LIBREADLINE= LTLIBREADLINE= fi diff --git a/m4/readutmp.m4 b/m4/readutmp.m4 index d458a8b554..ec40019735 100644 --- a/m4/readutmp.m4 +++ b/m4/readutmp.m4 @@ -1,4 +1,4 @@ -# readutmp.m4 serial 30 +# readutmp.m4 serial 31 dnl Copyright (C) 2002-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,7 @@ AC_DEFUN([gl_READUTMP], if test $ac_cv_header_systemd_sd_login_h = yes; then AC_CACHE_CHECK([for libsystemd version >= 254], [gl_cv_lib_readutmp_systemd], - [gl_save_LIBS="$LIBS" + [gl_saved_LIBS="$LIBS" LIBS="$LIBS -lsystemd" AC_LINK_IFELSE( [AC_LANG_PROGRAM([[ @@ -31,7 +31,7 @@ AC_DEFUN([gl_READUTMP], ], [gl_cv_lib_readutmp_systemd=yes], [gl_cv_lib_readutmp_systemd=no]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test $gl_cv_lib_readutmp_systemd = yes; then AC_DEFINE([READUTMP_USE_SYSTEMD], [1], diff --git a/m4/remainder.m4 b/m4/remainder.m4 index 5746fc5be6..bce9781bae 100644 --- a/m4/remainder.m4 +++ b/m4/remainder.m4 @@ -1,4 +1,4 @@ -# remainder.m4 serial 11 +# remainder.m4 serial 12 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -32,7 +32,7 @@ AC_DEFUN([gl_FUNC_REMAINDER], AC_CACHE_CHECK([whether remainder() can be used with libm], [gl_cv_func_remainder_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -45,7 +45,7 @@ AC_DEFUN([gl_FUNC_REMAINDER], [[return remainder (x, y) > 1;]])], [gl_cv_func_remainder_in_libm=yes], [gl_cv_func_remainder_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_remainder_in_libm = yes; then REMAINDER_LIBM=-lm @@ -60,7 +60,7 @@ AC_DEFUN([gl_FUNC_REMAINDER], AC_CACHE_CHECK([whether remainder works according to ISO C 99 with IEC 60559], [gl_cv_func_remainder_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $REMAINDER_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -102,7 +102,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_remainder_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_remainder_ieee" in *yes) ;; diff --git a/m4/remainderf.m4 b/m4/remainderf.m4 index a1083b6e33..2aeff0192b 100644 --- a/m4/remainderf.m4 +++ b/m4/remainderf.m4 @@ -1,4 +1,4 @@ -# remainderf.m4 serial 15 +# remainderf.m4 serial 16 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_REMAINDERF], dnl Test whether remainderf() exists. Assume that remainderf(), if it exists, is dnl defined in the same library as remainder(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $REMAINDER_LIBM" AC_CACHE_CHECK([for remainderf], [gl_cv_func_remainderf], @@ -39,14 +39,14 @@ AC_DEFUN([gl_FUNC_REMAINDERF], [gl_cv_func_remainderf=yes], [gl_cv_func_remainderf=no]) ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $gl_cv_func_remainderf = yes; then REMAINDERF_LIBM="$REMAINDER_LIBM" - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $REMAINDERF_LIBM" gl_FUNC_REMAINDERF_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_remainderf_works" in *yes) ;; *) REPLACE_REMAINDERF=1 ;; @@ -58,7 +58,7 @@ AC_DEFUN([gl_FUNC_REMAINDERF], AC_CACHE_CHECK([whether remainderf works according to ISO C 99 with IEC 60559], [gl_cv_func_remainderf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $REMAINDERF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -105,7 +105,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_remainderf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_remainderf_ieee" in *yes) ;; diff --git a/m4/remainderl.m4 b/m4/remainderl.m4 index 608e31baca..3986910514 100644 --- a/m4/remainderl.m4 +++ b/m4/remainderl.m4 @@ -1,4 +1,4 @@ -# remainderl.m4 serial 15 +# remainderl.m4 serial 16 dnl Copyright (C) 2012-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ AC_DEFUN([gl_FUNC_REMAINDERL], dnl Test whether remainderl() exists. Assume that remainderl(), if it exists, is dnl defined in the same library as remainder(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $REMAINDER_LIBM" AC_CACHE_CHECK([for remainderl], [gl_cv_func_remainderl], @@ -40,7 +40,7 @@ AC_DEFUN([gl_FUNC_REMAINDERL], [gl_cv_func_remainderl=yes], [gl_cv_func_remainderl=no]) ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $gl_cv_func_remainderl = yes; then HAVE_REMAINDERL=1 REMAINDERL_LIBM="$REMAINDER_LIBM" @@ -48,10 +48,10 @@ AC_DEFUN([gl_FUNC_REMAINDERL], dnl IRIX 6.5 has remainderl() in libm but doesn't declare it in . AC_CHECK_DECLS([remainderl], , [HAVE_DECL_REMAINDERL=0], [[#include ]]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $REMAINDERL_LIBM" gl_FUNC_REMAINDERL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_remainderl_works" in *yes) ;; *) REPLACE_REMAINDERL=1 ;; @@ -63,7 +63,7 @@ AC_DEFUN([gl_FUNC_REMAINDERL], AC_CACHE_CHECK([whether remainderl works according to ISO C 99 with IEC 60559], [gl_cv_func_remainderl_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $REMAINDERL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -110,7 +110,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_remainderl_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_remainderl_ieee" in *yes) ;; diff --git a/m4/rintl.m4 b/m4/rintl.m4 index f1dbd65938..01cc6cf50f 100644 --- a/m4/rintl.m4 +++ b/m4/rintl.m4 @@ -1,4 +1,4 @@ -# rintl.m4 serial 10 +# rintl.m4 serial 11 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_RINTL], AC_CACHE_CHECK([whether rintl works], [gl_cv_func_rintl_works], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $RINTL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -60,7 +60,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_rintl_works="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_rintl_works" in *yes) ;; diff --git a/m4/round.m4 b/m4/round.m4 index c7d36408e6..eb066c7e31 100644 --- a/m4/round.m4 +++ b/m4/round.m4 @@ -1,4 +1,4 @@ -# round.m4 serial 26 +# round.m4 serial 27 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_ROUND], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether round works], [gl_cv_func_round_works], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ROUND_LIBM" AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -74,7 +74,7 @@ int main() *) gl_cv_func_round_works="guessing yes" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_round_works" in *no) REPLACE_ROUND=1 ;; @@ -86,7 +86,7 @@ int main() AC_CACHE_CHECK([whether round works according to ISO C 99 with IEC 60559], [gl_cv_func_round_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ROUND_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -132,7 +132,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_round_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_round_ieee" in *yes) ;; diff --git a/m4/roundf.m4 b/m4/roundf.m4 index 0193d6c018..4d34572612 100644 --- a/m4/roundf.m4 +++ b/m4/roundf.m4 @@ -1,4 +1,4 @@ -# roundf.m4 serial 27 +# roundf.m4 serial 28 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_ROUNDF], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether roundf works], [gl_cv_func_roundf_works], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ROUNDF_LIBM" AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -75,7 +75,7 @@ int main() ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_roundf_works" in *no) REPLACE_ROUNDF=1 ;; @@ -87,7 +87,7 @@ int main() AC_CACHE_CHECK([whether roundf works according to ISO C 99 with IEC 60559], [gl_cv_func_roundf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ROUNDF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -137,7 +137,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_roundf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_roundf_ieee" in *yes) ;; diff --git a/m4/roundl.m4 b/m4/roundl.m4 index f1b2bb4cb4..9e9b0b08fd 100644 --- a/m4/roundl.m4 +++ b/m4/roundl.m4 @@ -1,4 +1,4 @@ -# roundl.m4 serial 22 +# roundl.m4 serial 23 dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -32,7 +32,7 @@ AC_DEFUN([gl_FUNC_ROUNDL], AC_CACHE_CHECK([whether roundl works according to ISO C 99 with IEC 60559], [gl_cv_func_roundl_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $ROUNDL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -74,7 +74,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_roundl_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_roundl_ieee" in *yes) ;; diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4 index d92c01b564..bdbe003c39 100644 --- a/m4/selinux-selinux-h.m4 +++ b/m4/selinux-selinux-h.m4 @@ -1,4 +1,4 @@ -# serial 7 -*- Autoconf -*- +# serial 8 -*- Autoconf -*- # Copyright (C) 2006-2007, 2009-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -65,11 +65,11 @@ AC_DEFUN([gl_LIBSELINUX], LIB_SELINUX= if test "$with_selinux" != no; then - gl_save_LIBS=$LIBS + gl_saved_LIBS=$LIBS AC_SEARCH_LIBS([setfilecon], [selinux], [test "$ac_cv_search_setfilecon" = "none required" || LIB_SELINUX=$ac_cv_search_setfilecon]) - LIBS=$gl_save_LIBS + LIBS=$gl_saved_LIBS fi AC_SUBST([LIB_SELINUX]) diff --git a/m4/semaphore.m4 b/m4/semaphore.m4 index 87fc48ed1c..9d43432068 100644 --- a/m4/semaphore.m4 +++ b/m4/semaphore.m4 @@ -1,4 +1,4 @@ -# semaphore.m4 serial 1 +# semaphore.m4 serial 2 dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,7 @@ AC_DEFUN([gl_SEMAPHORE], dnl $LIBMULTITHREAD. Therefore, the only library we need to test for is -lrt. AC_CACHE_CHECK([for library needed for semaphore functions], [gl_cv_semaphore_lib], - [save_LIBS="$LIBS" + [saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -34,7 +34,7 @@ AC_DEFUN([gl_SEMAPHORE], [gl_cv_semaphore_lib='-lrt'], [gl_cv_semaphore_lib=none]) ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test "x$gl_cv_semaphore_lib" = xnone; then LIB_SEMAPHORE= diff --git a/m4/servent.m4 b/m4/servent.m4 index 7673a6395c..fffb95164d 100644 --- a/m4/servent.m4 +++ b/m4/servent.m4 @@ -1,4 +1,4 @@ -# servent.m4 serial 4 +# servent.m4 serial 5 dnl Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -28,7 +28,7 @@ AC_DEFUN([gl_SERVENT], AC_CACHE_CHECK([for getservbyname in winsock2.h and -lws2_32], [gl_cv_w32_getservbyname], [gl_cv_w32_getservbyname=no - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -40,7 +40,7 @@ AC_DEFUN([gl_SERVENT], ]], [[getservbyname(NULL,NULL);]])], [gl_cv_w32_getservbyname=yes]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_w32_getservbyname" = "yes"; then SERVENT_LIB="-lws2_32" diff --git a/m4/sinf.m4 b/m4/sinf.m4 index 4e254e47e0..52fe7949bb 100644 --- a/m4/sinf.m4 +++ b/m4/sinf.m4 @@ -1,4 +1,4 @@ -# sinf.m4 serial 3 +# sinf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_SINF], dnl Test whether sinf() exists. Assume that sinf(), if it exists, is dnl defined in the same library as sin(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $SIN_LIBM" AC_CHECK_FUNCS([sinf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_sinf = yes; then SINF_LIBM="$SIN_LIBM" else diff --git a/m4/sinhf.m4 b/m4/sinhf.m4 index 81aeb4fda8..6baed8159d 100644 --- a/m4/sinhf.m4 +++ b/m4/sinhf.m4 @@ -1,4 +1,4 @@ -# sinhf.m4 serial 3 +# sinhf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_SINHF], dnl Test whether sinhf() exists. Assume that sinhf(), if it exists, is dnl defined in the same library as sinh(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $SINH_LIBM" AC_CHECK_FUNCS([sinhf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_sinhf = yes; then SINHF_LIBM="$SINH_LIBM" else diff --git a/m4/sinl.m4 b/m4/sinl.m4 index 55e9b3936f..ecc9e121de 100644 --- a/m4/sinl.m4 +++ b/m4/sinl.m4 @@ -1,4 +1,4 @@ -# sinl.m4 serial 9 +# sinl.m4 serial 10 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_SINL], AC_CACHE_CHECK([whether sinl() can be used with libm], [gl_cv_func_sinl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_SINL], || sinl (x) > 0.4;]])], [gl_cv_func_sinl_in_libm=yes], [gl_cv_func_sinl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_sinl_in_libm = yes; then SINL_LIBM=-lm diff --git a/m4/socketlib.m4 b/m4/socketlib.m4 index 5ecb34d34e..0633969653 100644 --- a/m4/socketlib.m4 +++ b/m4/socketlib.m4 @@ -1,4 +1,4 @@ -# socketlib.m4 serial 3 +# socketlib.m4 serial 4 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,7 @@ AC_DEFUN([gl_SOCKETLIB], dnl defined through -lws2_32), we need to call it. AC_CACHE_CHECK([for WSAStartup], [gl_cv_func_wsastartup], [ - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( [AC_LANG_PROGRAM([[ @@ -33,7 +33,7 @@ AC_DEFUN([gl_SOCKETLIB], ], [gl_cv_func_wsastartup=yes], [gl_cv_func_wsastartup=no]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test "$gl_cv_func_wsastartup" = "yes"; then AC_DEFINE([WINDOWS_SOCKETS], [1], [Define if WSAStartup is needed.]) @@ -56,8 +56,8 @@ AC_DEFUN([gl_SOCKETLIB], #endif char setsockopt();]], [[setsockopt();]])], [], - [gl_save_LIBS="$LIBS" - LIBS="$gl_save_LIBS -lsocket" + [gl_saved_LIBS="$LIBS" + LIBS="$gl_saved_LIBS -lsocket" AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern #ifdef __cplusplus "C" @@ -65,7 +65,7 @@ char setsockopt();]], [[setsockopt();]])], char setsockopt();]], [[setsockopt();]])], [gl_cv_lib_socket="-lsocket"]) if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnetwork" + LIBS="$gl_saved_LIBS -lnetwork" AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern #ifdef __cplusplus "C" @@ -73,7 +73,7 @@ char setsockopt();]], [[setsockopt();]])], char setsockopt();]], [[setsockopt();]])], [gl_cv_lib_socket="-lnetwork"]) if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnet" + LIBS="$gl_saved_LIBS -lnet" AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern #ifdef __cplusplus "C" @@ -82,7 +82,7 @@ char setsockopt();]], [[setsockopt();]])], [gl_cv_lib_socket="-lnet"]) fi fi - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" ]) if test -z "$gl_cv_lib_socket"; then gl_cv_lib_socket="none needed" diff --git a/m4/sqrtf.m4 b/m4/sqrtf.m4 index abeb5739e0..c1f4490dea 100644 --- a/m4/sqrtf.m4 +++ b/m4/sqrtf.m4 @@ -1,4 +1,4 @@ -# sqrtf.m4 serial 3 +# sqrtf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_SQRTF], dnl Test whether sqrtf() exists. Assume that sqrtf(), if it exists, is dnl defined in the same library as sqrt(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $SQRT_LIBM" AC_CHECK_FUNCS([sqrtf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_sqrtf = yes; then SQRTF_LIBM="$SQRT_LIBM" else diff --git a/m4/sqrtl.m4 b/m4/sqrtl.m4 index da9324eb52..7c68807962 100644 --- a/m4/sqrtl.m4 +++ b/m4/sqrtl.m4 @@ -1,4 +1,4 @@ -# sqrtl.m4 serial 12 +# sqrtl.m4 serial 13 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_SQRTL], AC_CACHE_CHECK([whether sqrtl() can be used with libm], [gl_cv_func_sqrtl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_SQRTL], || sqrtl (x) > 0.4;]])], [gl_cv_func_sqrtl_in_libm=yes], [gl_cv_func_sqrtl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_sqrtl_in_libm = yes; then SQRTL_LIBM=-lm @@ -59,10 +59,10 @@ AC_DEFUN([gl_FUNC_SQRTL], dnl Mac OS X 10.3 has sqrtl() in libc but doesn't declare it in . AC_CHECK_DECL([sqrtl], , [HAVE_DECL_SQRTL=0], [[#include ]]) - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $SQRTL_LIBM" gl_FUNC_SQRTL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_sqrtl_works" in *yes) ;; *) REPLACE_SQRTL=1 ;; diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 2efd5f9692..e3c1e60923 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -13,10 +13,10 @@ AC_DEFUN([gl_ALIGNASOF], [ AC_CACHE_CHECK([for alignas and alignof], [gl_cv_header_working_stdalign_h], - [gl_save_CFLAGS=$CFLAGS + [gl_saved_CFLAGS=$CFLAGS for gl_working in "yes, keywords" "yes, macros"; do AS_CASE([$gl_working], - [*stdalign.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H"]) + [*stdalign.h*], [CFLAGS="$gl_saved_CFLAGS -DINCLUDE_STDALIGN_H"]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include @@ -56,7 +56,7 @@ AC_DEFUN([gl_ALIGNASOF], [gl_cv_header_working_stdalign_h=$gl_working], [gl_cv_header_working_stdalign_h=no]) - CFLAGS=$gl_save_CFLAGS + CFLAGS=$gl_saved_CFLAGS test "$gl_cv_header_working_stdalign_h" != no && break done]) diff --git a/m4/tanf.m4 b/m4/tanf.m4 index 0e24733b19..ad46806538 100644 --- a/m4/tanf.m4 +++ b/m4/tanf.m4 @@ -1,4 +1,4 @@ -# tanf.m4 serial 3 +# tanf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_TANF], dnl Test whether tanf() exists. Assume that tanf(), if it exists, is dnl defined in the same library as tan(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $TAN_LIBM" AC_CHECK_FUNCS([tanf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_tanf = yes; then TANF_LIBM="$TAN_LIBM" else diff --git a/m4/tanhf.m4 b/m4/tanhf.m4 index 144961bfe2..014e5c17f4 100644 --- a/m4/tanhf.m4 +++ b/m4/tanhf.m4 @@ -1,4 +1,4 @@ -# tanhf.m4 serial 3 +# tanhf.m4 serial 4 dnl Copyright (C) 2011-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,10 @@ AC_DEFUN([gl_FUNC_TANHF], dnl Test whether tanhf() exists. Assume that tanhf(), if it exists, is dnl defined in the same library as tanh(). - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $TANH_LIBM" AC_CHECK_FUNCS([tanhf]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" if test $ac_cv_func_tanhf = yes; then TANHF_LIBM="$TANH_LIBM" else diff --git a/m4/tanl.m4 b/m4/tanl.m4 index dd42ab521c..ec8cef1c5e 100644 --- a/m4/tanl.m4 +++ b/m4/tanl.m4 @@ -1,4 +1,4 @@ -# tanl.m4 serial 9 +# tanl.m4 serial 10 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_TANL], AC_CACHE_CHECK([whether tanl() can be used with libm], [gl_cv_func_tanl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_TANL], || tanl (x) > 0.4;]])], [gl_cv_func_tanl_in_libm=yes], [gl_cv_func_tanl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) if test $gl_cv_func_tanl_in_libm = yes; then TANL_LIBM=-lm diff --git a/m4/termcap.m4 b/m4/termcap.m4 index 93081dc145..8120e366d7 100644 --- a/m4/termcap.m4 +++ b/m4/termcap.m4 @@ -1,4 +1,4 @@ -# termcap.m4 serial 11 +# termcap.m4 serial 12 dnl Copyright (C) 2000-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -93,7 +93,7 @@ AC_DEFUN([gl_TERMCAP_BODY], [[return tgetent ((char *) 0, "xterm");]])], [gl_cv_termcap=libc]) if test "$gl_cv_termcap" != libc; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBNCURSES" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -105,9 +105,9 @@ AC_DEFUN([gl_TERMCAP_BODY], ]], [[return tgetent ((char *) 0, "xterm");]])], [gl_cv_termcap=libncurses]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" if test "$gl_cv_termcap" != libncurses; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBTERMCAP" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -119,9 +119,9 @@ AC_DEFUN([gl_TERMCAP_BODY], ]], [[return tgetent ((char *) 0, "xterm");]])], [gl_cv_termcap=libtermcap]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" if test "$gl_cv_termcap" != libtermcap; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBXCURSES" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -133,9 +133,9 @@ AC_DEFUN([gl_TERMCAP_BODY], ]], [[return tgetent ((char *) 0, "xterm");]])], [gl_cv_termcap=libxcurses]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" if test "$gl_cv_termcap" != libxcurses; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBCURSES" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -147,7 +147,7 @@ AC_DEFUN([gl_TERMCAP_BODY], ]], [[return tgetent ((char *) 0, "xterm");]])], [gl_cv_termcap=libcurses]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" fi fi fi @@ -195,9 +195,9 @@ AC_DEFUN([gl_TERMCAP_BODY], dnl Test whether the terminfo functions are available from the same library. AC_CACHE_CHECK([for terminfo functions], [gl_cv_func_terminfo], [ - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBTERMCAP" - gl_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCTERMCAP" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -225,8 +225,8 @@ AC_DEFUN([gl_TERMCAP_BODY], [[return setupterm ("xterm", 0, (int *)0) + tigetnum ("colors") + tigetflag ("hc") + * tigetstr ("oc");]])], [gl_cv_func_terminfo=yes], [gl_cv_func_terminfo=no]) - CPPFLAGS="$gl_save_CPPFLAGS" - LIBS="$gl_save_LIBS" + CPPFLAGS="$gl_saved_CPPFLAGS" + LIBS="$gl_saved_LIBS" ]) if test $gl_cv_func_terminfo = yes; then AC_DEFINE([HAVE_TERMINFO], 1, @@ -237,9 +237,9 @@ AC_DEFUN([gl_TERMCAP_BODY], dnl Test against the old GNU termcap, which provides a tparam() function dnl instead of the classical tparm() function. AC_CACHE_CHECK([for tparam], [gl_cv_termcap_tparam], [ - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBTERMCAP" - gl_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCTERMCAP" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -252,8 +252,8 @@ AC_DEFUN([gl_TERMCAP_BODY], ]], [[return ! tparam ("\033\133%dm", &buf, 1, 8);]])], [gl_cv_termcap_tparam=yes], [gl_cv_termcap_tparam=no]) - CPPFLAGS="$gl_save_CPPFLAGS" - LIBS="$gl_save_LIBS" + CPPFLAGS="$gl_saved_CPPFLAGS" + LIBS="$gl_saved_LIBS" ]) if test $gl_cv_termcap_tparam = yes; then AC_DEFINE([HAVE_TPARAM], 1, @@ -262,9 +262,9 @@ AC_DEFUN([gl_TERMCAP_BODY], dnl Test whether a tparm() function is provided. It is missing e.g. dnl in NetBSD 3.0 libtermcap. AC_CACHE_CHECK([for tparm], [gl_cv_termcap_tparm], [ - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBTERMCAP" - gl_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCTERMCAP" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -276,8 +276,8 @@ AC_DEFUN([gl_TERMCAP_BODY], ]], [[return ! tparm ("\033\133%dm", 8);]])], [gl_cv_termcap_tparm=yes], [gl_cv_termcap_tparm=no]) - CPPFLAGS="$gl_save_CPPFLAGS" - LIBS="$gl_save_LIBS" + CPPFLAGS="$gl_saved_CPPFLAGS" + LIBS="$gl_saved_LIBS" ]) fi ]) diff --git a/m4/terminfo.m4 b/m4/terminfo.m4 index 39ce4721a3..2945dbbc25 100644 --- a/m4/terminfo.m4 +++ b/m4/terminfo.m4 @@ -1,4 +1,4 @@ -# terminfo.m4 serial 6 +# terminfo.m4 serial 7 dnl Copyright (C) 2000-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -46,9 +46,9 @@ AC_DEFUN([gl_TERMINFO_BODY], AC_REQUIRE([AC_LIB_RPATH]) dnl Avoid disturbing the gl_TERMCAP_BODY macro. - gl_save_LIBTERMCAP="$LIBTERMCAP" - gl_save_LTLIBTERMCAP="$LTLIBTERMCAP" - gl_save_INCTERMCAP="$INCTERMCAP" + gl_saved_LIBTERMCAP="$LIBTERMCAP" + gl_saved_LTLIBTERMCAP="$LTLIBTERMCAP" + gl_saved_INCTERMCAP="$INCTERMCAP" if test "$gl_curses_allowed" != no; then @@ -120,7 +120,7 @@ AC_DEFUN([gl_TERMINFO_BODY], + tigetflag ("hc") + * tigetstr ("oc");]])], [gl_cv_terminfo=libc]) if test "$gl_cv_terminfo" != libc; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBNCURSES" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -149,9 +149,9 @@ AC_DEFUN([gl_TERMINFO_BODY], + tigetnum ("colors") + tigetflag ("hc") + * tigetstr ("oc");]])], [gl_cv_terminfo=libncurses]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" if test "$gl_cv_terminfo" != libncurses; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBTERMCAP" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -180,9 +180,9 @@ AC_DEFUN([gl_TERMINFO_BODY], + tigetnum ("colors") + tigetflag ("hc") + * tigetstr ("oc");]])], [gl_cv_terminfo=libtermcap]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" if test "$gl_cv_terminfo" != libtermcap; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBXCURSES" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -211,9 +211,9 @@ AC_DEFUN([gl_TERMINFO_BODY], + tigetnum ("colors") + tigetflag ("hc") + * tigetstr ("oc");]])], [gl_cv_terminfo=libxcurses]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" if test "$gl_cv_terminfo" != libxcurses; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBCURSES" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -242,7 +242,7 @@ AC_DEFUN([gl_TERMINFO_BODY], + tigetnum ("colors") + tigetflag ("hc") + * tigetstr ("oc");]])], [gl_cv_terminfo=libcurses]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" fi fi fi @@ -296,7 +296,7 @@ AC_DEFUN([gl_TERMINFO_BODY], [[return tgetent ((char *) 0, "xterm");]])], [gl_cv_termcap=libc]) if test "$gl_cv_termcap" != libc; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBNCURSES" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -308,9 +308,9 @@ AC_DEFUN([gl_TERMINFO_BODY], ]], [[return tgetent ((char *) 0, "xterm");]])], [gl_cv_termcap=libncurses]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" if test "$gl_cv_termcap" != libncurses; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBTERMCAP" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -322,7 +322,7 @@ AC_DEFUN([gl_TERMINFO_BODY], ]], [[return tgetent ((char *) 0, "xterm");]])], [gl_cv_termcap=libtermcap]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" fi fi ]) @@ -359,9 +359,9 @@ AC_DEFUN([gl_TERMINFO_BODY], dnl Test against the old GNU termcap, which provides a tparam() function dnl instead of the classical tparm() function. AC_CACHE_CHECK([for tparam], [gl_cv_terminfo_tparam], [ - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBTERMINFO" - gl_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCTERMINFO" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -375,8 +375,8 @@ AC_DEFUN([gl_TERMINFO_BODY], [[return ! tparam ("\033\133%dm", &buf, 1, 8);]])], [gl_cv_terminfo_tparam=yes], [gl_cv_terminfo_tparam=no]) - CPPFLAGS="$gl_save_CPPFLAGS" - LIBS="$gl_save_LIBS" + CPPFLAGS="$gl_saved_CPPFLAGS" + LIBS="$gl_saved_LIBS" ]) if test $gl_cv_terminfo_tparam = yes; then AC_DEFINE([HAVE_TPARAM], 1, @@ -385,9 +385,9 @@ AC_DEFUN([gl_TERMINFO_BODY], dnl Test whether a tparm() function is provided. It is missing e.g. dnl in NetBSD 3.0 libtermcap. AC_CACHE_CHECK([for tparm], [gl_cv_terminfo_tparm], [ - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBTERMINFO" - gl_save_CPPFLAGS="$CPPFLAGS" + gl_saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCTERMINFO" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -399,13 +399,13 @@ AC_DEFUN([gl_TERMINFO_BODY], ]], [[return ! tparm ("\033\133%dm", 8);]])], [gl_cv_terminfo_tparm=yes], [gl_cv_terminfo_tparm=no]) - CPPFLAGS="$gl_save_CPPFLAGS" - LIBS="$gl_save_LIBS" + CPPFLAGS="$gl_saved_CPPFLAGS" + LIBS="$gl_saved_LIBS" ]) fi dnl Avoid disturbing the gl_TERMCAP_BODY macro. - LIBTERMCAP="$gl_save_LIBTERMCAP" - LTLIBTERMCAP="$gl_save_LTLIBTERMCAP" - INCTERMCAP="$gl_save_INCTERMCAP" + LIBTERMCAP="$gl_saved_LIBTERMCAP" + LTLIBTERMCAP="$gl_saved_LTLIBTERMCAP" + INCTERMCAP="$gl_saved_INCTERMCAP" ]) diff --git a/m4/thrd.m4 b/m4/thrd.m4 index 1770034b2a..1745ee97d5 100644 --- a/m4/thrd.m4 +++ b/m4/thrd.m4 @@ -1,4 +1,4 @@ -# thrd.m4 serial 4 +# thrd.m4 serial 5 dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -27,7 +27,7 @@ AC_DEFUN([gl_FUNC_THRD_JOIN], dnl On Solaris 11.4, thrd_join crashes when the second argument is NULL. AC_CACHE_CHECK([whether thrd_join with NULL argument works], [gl_cv_func_thrd_join_null_works], - [save_LIBS="$LIBS" + [saved_LIBS="$LIBS" LIBS="$LIBS $LIBSTDTHREAD" AC_RUN_IFELSE( [AC_LANG_PROGRAM( @@ -53,7 +53,7 @@ AC_DEFUN([gl_FUNC_THRD_JOIN], *) gl_cv_func_thrd_join_null_works="guessing yes" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_thrd_join_null_works" in *yes) ;; diff --git a/m4/thread.m4 b/m4/thread.m4 index c2aead4abc..a840de6fba 100644 --- a/m4/thread.m4 +++ b/m4/thread.m4 @@ -1,4 +1,4 @@ -# thread.m4 serial 4 +# thread.m4 serial 5 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,9 +9,9 @@ AC_DEFUN([gl_THREAD], AC_REQUIRE([gl_THREADLIB]) if test $gl_threads_api = posix; then - gl_save_LIBS="$LIBS" + gl_saved_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" gl_CHECK_FUNCS_ANDROID([pthread_atfork], [[#include ]]) - LIBS="$gl_save_LIBS" + LIBS="$gl_saved_LIBS" fi ]) diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index 0be2c987b1..6dee893ed8 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,4 +1,4 @@ -# threadlib.m4 serial 41 +# threadlib.m4 serial 42 dnl Copyright (C) 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -206,7 +206,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY], # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 # needs -pthread for some reason. See: # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html - save_LIBS=$LIBS + saved_LIBS="$LIBS" for gl_pthread in '' '-pthread'; do LIBS="$LIBS $gl_pthread" AC_LINK_IFELSE( @@ -220,7 +220,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY], [gl_pthread_api=yes LIBPTHREAD=$gl_pthread LIBPMULTITHREAD=$gl_pthread]) - LIBS=$save_LIBS + LIBS="$saved_LIBS" test $gl_pthread_api = yes && break done echo "$as_me:__oline__: gl_pthread_api=$gl_pthread_api" >&AS_MESSAGE_LOG_FD diff --git a/m4/threads_h.m4 b/m4/threads_h.m4 index 96af0dda38..e1ed1a1444 100644 --- a/m4/threads_h.m4 +++ b/m4/threads_h.m4 @@ -1,4 +1,4 @@ -# threads_h.m4 serial 14 +# threads_h.m4 serial 15 dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -49,7 +49,7 @@ AC_DEFUN_ONCE([gl_THREADS_H], dnl On AIX 7.3.1, thrd_join still never stores an exit code. AC_CACHE_CHECK([whether thrd_join works], [gl_cv_func_thrd_join_works], - [save_LIBS="$LIBS" + [saved_LIBS="$LIBS" LIBS="$LIBS $LIBSTDTHREAD" AC_RUN_IFELSE( [AC_LANG_PROGRAM( @@ -79,7 +79,7 @@ AC_DEFUN_ONCE([gl_THREADS_H], *) gl_cv_func_thrd_join_works="guessing yes" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_thrd_join_works" in *yes) ;; diff --git a/m4/trunc.m4 b/m4/trunc.m4 index 3db7acd2ec..d0631369ad 100644 --- a/m4/trunc.m4 +++ b/m4/trunc.m4 @@ -1,4 +1,4 @@ -# trunc.m4 serial 17 +# trunc.m4 serial 18 dnl Copyright (C) 2007, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_TRUNC], [[x = funcptr(x) + trunc(x);]])], [TRUNC_LIBM=]) if test "$TRUNC_LIBM" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_TRUNC], double x;]], [[x = funcptr(x) + trunc(x);]])], [TRUNC_LIBM="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi if test "$TRUNC_LIBM" = "?"; then TRUNC_LIBM= @@ -49,7 +49,7 @@ AC_DEFUN([gl_FUNC_TRUNC], AC_CACHE_CHECK([whether trunc works according to ISO C 99 with IEC 60559], [gl_cv_func_trunc_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $TRUNC_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -82,7 +82,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_trunc_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_trunc_ieee" in *yes) ;; diff --git a/m4/truncf.m4 b/m4/truncf.m4 index 9f1a027b5b..7d1d92af12 100644 --- a/m4/truncf.m4 +++ b/m4/truncf.m4 @@ -1,4 +1,4 @@ -# truncf.m4 serial 17 +# truncf.m4 serial 18 dnl Copyright (C) 2007, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_TRUNCF], [[x = funcptr(x) + truncf(x);]])], [TRUNCF_LIBM=]) if test "$TRUNCF_LIBM" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_TRUNCF], float x;]], [[x = funcptr(x) + truncf(x);]])], [TRUNCF_LIBM="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi if test "$TRUNCF_LIBM" = "?"; then TRUNCF_LIBM= @@ -49,7 +49,7 @@ AC_DEFUN([gl_FUNC_TRUNCF], AC_CACHE_CHECK([whether truncf works according to ISO C 99 with IEC 60559], [gl_cv_func_truncf_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $TRUNCF_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -82,7 +82,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_truncf_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_truncf_ieee" in *yes) ;; diff --git a/m4/truncl.m4 b/m4/truncl.m4 index 1ba0293ee2..38e1ca9ec0 100644 --- a/m4/truncl.m4 +++ b/m4/truncl.m4 @@ -1,4 +1,4 @@ -# truncl.m4 serial 19 +# truncl.m4 serial 20 dnl Copyright (C) 2007-2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -30,7 +30,7 @@ AC_DEFUN([gl_FUNC_TRUNCL], [[x = funcptr(x) + truncl(x);]])], [TRUNCL_LIBM=]) if test "$TRUNCL_LIBM" = "?"; then - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -42,13 +42,13 @@ AC_DEFUN([gl_FUNC_TRUNCL], long double x;]], [[x = funcptr(x) + truncl(x);]])], [TRUNCL_LIBM="-lm"]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" fi if test "$TRUNCL_LIBM" = "?"; then TRUNCL_LIBM= fi dnl Test whether truncl() works. It crashes on OSF/1 4.0d. - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $TRUNCL_LIBM" AC_CACHE_CHECK([whether truncl works], [gl_cv_func_truncl_works], [ @@ -71,7 +71,7 @@ int main() esac ]) ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_truncl_works" in *yes) ;; *) REPLACE_TRUNCL=1 ;; @@ -82,7 +82,7 @@ int main() AC_CACHE_CHECK([whether truncl works according to ISO C 99 with IEC 60559], [gl_cv_func_truncl_ieee], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS $TRUNCL_LIBM" AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -115,7 +115,7 @@ int main (int argc, char *argv[]) *) gl_cv_func_truncl_ieee="$gl_cross_guess_normal" ;; esac ]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) case "$gl_cv_func_truncl_ieee" in *yes) ;; diff --git a/m4/visibility.m4 b/m4/visibility.m4 index b9b36a86ba..e091f02824 100644 --- a/m4/visibility.m4 +++ b/m4/visibility.m4 @@ -1,4 +1,4 @@ -# visibility.m4 serial 8 +# visibility.m4 serial 9 dnl Copyright (C) 2005, 2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -31,18 +31,18 @@ AC_DEFUN([gl_VISIBILITY], dnl user has put into $CC $CFLAGS $CPPFLAGS. AC_CACHE_CHECK([whether the -Werror option is usable], [gl_cv_cc_vis_werror], - [gl_save_CFLAGS="$CFLAGS" + [gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[]], [[]])], [gl_cv_cc_vis_werror=yes], [gl_cv_cc_vis_werror=no]) - CFLAGS="$gl_save_CFLAGS" + CFLAGS="$gl_saved_CFLAGS" ]) dnl Now check whether visibility declarations are supported. AC_CACHE_CHECK([for simple visibility declarations], [gl_cv_cc_visibility], - [gl_save_CFLAGS="$CFLAGS" + [gl_saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" dnl We use the option -Werror and a function dummyfunc, because on some dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning @@ -68,7 +68,7 @@ AC_DEFUN([gl_VISIBILITY], [[]])], [gl_cv_cc_visibility=yes], [gl_cv_cc_visibility=no]) - CFLAGS="$gl_save_CFLAGS" + CFLAGS="$gl_saved_CFLAGS" ]) if test $gl_cv_cc_visibility = yes; then CFLAG_VISIBILITY="-fvisibility=hidden" diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index 6e251fb81e..eef3a8483d 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,4 +1,4 @@ -# warn-on-use.m4 serial 10 +# warn-on-use.m4 serial 11 dnl Copyright (C) 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -36,7 +36,7 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], dnl clang (e.g. strndup), reference ac_compile_for_check_decl instead dnl of ac_compile. If, for whatever reason, the override of AC_PROG_CC dnl in zzgnulib.m4 is inactive, use the original ac_compile. - ac_save_ac_compile="$ac_compile" + ac_saved_ac_compile="$ac_compile" if test -n "$ac_compile_for_check_decl"; then ac_compile="$ac_compile_for_check_decl" fi @@ -46,7 +46,7 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], [[#undef $gl_func (void) $gl_func;]])], [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])]) - ac_compile="$ac_save_ac_compile" + ac_compile="$ac_saved_ac_compile" AS_VAR_IF([gl_Symbol], [yes], [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) dnl Shortcut for an AC_CHECK_DECL invocation that may come later: diff --git a/m4/warnings.m4 b/m4/warnings.m4 index 6c97ef194e..d487636aa3 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,4 +1,4 @@ -# warnings.m4 serial 19 +# warnings.m4 serial 20 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,13 +26,13 @@ case $gl_positive in esac m4_pushdef([gl_Positive], [$gl_positive])])dnl AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], [gl_Warn], [ - gl_save_compiler_FLAGS="$gl_Flags" + gl_saved_compiler_FLAGS="$gl_Flags" AS_VAR_APPEND(m4_defn([gl_Flags]), [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([[]])])], [AS_VAR_SET([gl_Warn], [yes])], [AS_VAR_SET([gl_Warn], [no])]) - gl_Flags="$gl_save_compiler_FLAGS" + gl_Flags="$gl_saved_compiler_FLAGS" ]) AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) m4_popdef([gl_Positive])dnl diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 3582fa774f..173f42a45a 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 62 +# wchar_h.m4 serial 63 AC_DEFUN_ONCE([gl_WCHAR_H], [ @@ -86,8 +86,8 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK], dnl z/OS when using the XPLINK object format (due to duplicate dnl CSECT names). Instead, temporarily redefine $ac_compile so dnl that the object file has the latter name from the start. - save_ac_compile="$ac_compile" - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` + saved_ac_compile="$ac_compile" + ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest1/` if echo '#include "conftest.c"' >conftest1.c \ && AC_TRY_EVAL([ac_compile]); then AC_LANG_CONFTEST([ @@ -97,7 +97,7 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK], int zero (void) { return 0; } ]])]) dnl See note above about renaming object files. - ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` + ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest2/` if echo '#include "conftest.c"' >conftest2.c \ && AC_TRY_EVAL([ac_compile]); then if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then @@ -107,7 +107,7 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK], fi fi fi - ac_compile="$save_ac_compile" + ac_compile="$saved_ac_compile" rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext ;; esac diff --git a/posix-modules b/posix-modules index 8de3844d64..0da6942738 100755 --- a/posix-modules +++ b/posix-modules @@ -133,17 +133,17 @@ func_gnulib_dir () ;; esac fi - save_IFS="$IFS" + saved_IFS="$IFS" IFS="$PATH_SEPARATOR" for d in $pathx; do - IFS="$save_IFS" + IFS="$saved_IFS" test -z "$d" && d=. if test -x "$d/$progname" && test ! -d "$d/$progname"; then self_abspathname="$d/$progname" break fi done - IFS="$save_IFS" + IFS="$saved_IFS" if test -z "$self_abspathname"; then func_fatal_error "could not locate the posix-modules program - how did you invoke it?" fi diff --git a/tests/init.sh b/tests/init.sh index 1e15636c63..c5ec5cfd58 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -434,10 +434,10 @@ setup_ () # Remove relative and non-accessible directories from PATH, including '.' # and Zero-length entries. - save_IFS="$IFS"; IFS="$PATH_SEPARATOR" + saved_IFS="$IFS"; IFS="$PATH_SEPARATOR" new_PATH= for dir in $PATH; do - IFS="$save_IFS" + IFS="$saved_IFS" case "$dir" in [\\/]* | ?:[\\/]*) test -d "$dir/." || continue @@ -445,7 +445,7 @@ setup_ () ;; esac done - IFS="$save_IFS" + IFS="$saved_IFS" PATH="$new_PATH" export PATH }