From: Pietro Monteiro Date: Wed, 13 Aug 2025 01:12:50 +0000 (-0400) Subject: gnulib: Update obsolete autoconf macros X-Git-Tag: gdb-17-branchpoint~333 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02d9fa7cc2821c81a51e33cf0db7546ecbd284c1;p=thirdparty%2Fbinutils-gdb.git gnulib: Update obsolete autoconf macros Remove AM_PROG_CC_STDC, the correct macro AC_PROG_CC is already being used. Update AC_OUTPUT (file list, [cmd list]) by adding the file list to the previous AC_CONFIG_FILES and using AC_CONFIG_COMMANDS to output the command list. Approved-By: Tom Tromey --- diff --git a/gnulib/aclocal.m4 b/gnulib/aclocal.m4 index 707108d7abf..f99ab16edb8 100644 --- a/gnulib/aclocal.m4 +++ b/gnulib/aclocal.m4 @@ -788,35 +788,6 @@ else fi ]) -# -*- Autoconf -*- -# Obsolete and "removed" macros, that must however still report explicit -# error messages when used, to smooth transition. -# -# Copyright (C) 1996-2017 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -AC_DEFUN([AM_CONFIG_HEADER], -[AC_DIAGNOSE([obsolete], -['$0': this macro is obsolete. -You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl -AC_CONFIG_HEADERS($@)]) - -AC_DEFUN([AM_PROG_CC_STDC], -[AC_PROG_CC -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -AC_DIAGNOSE([obsolete], -['$0': this macro is obsolete. -You should simply use the 'AC][_PROG_CC' macro instead. -Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', -but upon 'ac_cv_prog_cc_stdc'.])]) - -AC_DEFUN([AM_C_PROTOTYPES], - [AC_FATAL([automatic de-ANSI-fication support has been removed])]) -AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) - # Helper functions for option handling. -*- Autoconf -*- # Copyright (C) 2001-2017 Free Software Foundation, Inc. diff --git a/gnulib/configure b/gnulib/configure index cc7e8287d5a..d3a049f1f5a 100755 --- a/gnulib/configure +++ b/gnulib/configure @@ -7223,9 +7223,6 @@ fi # Code from module xalloc-oversized: -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc - - ac_aux_dir= for ac_dir in .. "$srcdir"/..; do if test -f "$ac_dir/install-sh"; then @@ -13813,8 +13810,8 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:13816: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:13817: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:13813: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:13814: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -13839,7 +13836,7 @@ rm -f conftest* ;; esac - echo "$as_me:13842: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:13839: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -13993,7 +13990,7 @@ fi fi fi - echo "$as_me:13996: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:13993: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 $as_echo_n "checking whether POSIX threads API is available... " >&6; } @@ -17070,8 +17067,8 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:17073: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:17074: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:17070: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:17071: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -17096,7 +17093,7 @@ rm -f conftest* ;; esac - echo "$as_me:17099: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:17096: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -17250,7 +17247,7 @@ fi fi fi - echo "$as_me:17253: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:17250: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 $as_echo_n "checking whether POSIX threads API is available... " >&6; } @@ -17476,8 +17473,8 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:17479: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:17480: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:17476: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:17477: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -17502,7 +17499,7 @@ rm -f conftest* ;; esac - echo "$as_me:17505: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:17502: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -17656,7 +17653,7 @@ fi fi fi - echo "$as_me:17659: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:17656: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 $as_echo_n "checking whether POSIX threads API is available... " >&6; } @@ -36621,10 +36618,7 @@ fi # Checks for libraries. # # ---------------------- # -ac_config_files="$ac_config_files Makefile.gnulib.inc" - - -ac_config_files="$ac_config_files Makefile import/Makefile" +ac_config_files="$ac_config_files Makefile.gnulib.inc Makefile import/Makefile" ac_config_commands="$ac_config_commands default" @@ -36722,6 +36716,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' diff --git a/gnulib/configure.ac b/gnulib/configure.ac index c13465ca375..aee6450445d 100644 --- a/gnulib/configure.ac +++ b/gnulib/configure.ac @@ -31,7 +31,6 @@ AC_USE_SYSTEM_EXTENSIONS # there. ACX_LARGEFILE gl_EARLY -AM_PROG_CC_STDC AC_CONFIG_AUX_DIR(..) AC_CANONICAL_TARGET @@ -56,14 +55,15 @@ AC_CHECK_TOOL(AR, ar) # Checks for libraries. # # ---------------------- # -AC_CONFIG_FILES(Makefile.gnulib.inc) - -AC_OUTPUT(Makefile import/Makefile, +AC_CONFIG_FILES([Makefile.gnulib.inc] + [Makefile import/Makefile]) +AC_CONFIG_COMMANDS([default], [ case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac -]) +],[]) +AC_OUTPUT exit 0