From 3177752b38f9c2c5b93fb73cff9c8fe8efabdea8 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 20 Sep 2022 14:27:05 +0200 Subject: [PATCH 1/2] Make 'autoreconf' work for 'gcc', 'libobjc' With that, we may then run plain 'autoreconf' for all of GCC's subpackages, instead of for some of those (that don't use Automake) manually having to run the applicable combination of 'aclocal', 'autoconf', 'autoheader'. See also 'AC_CONFIG_MACRO_DIRS'/'AC_CONFIG_MACRO_DIR' usage elsewhere. gcc/ * configure.ac (AC_CONFIG_MACRO_DIRS): Instantiate. * configure: Regenerate. libobjc/ * configure.ac (AC_CONFIG_MACRO_DIRS): Instantiate. * configure: Regenerate. --- gcc/configure | 5 +++-- gcc/configure.ac | 1 + libobjc/configure | 5 +++-- libobjc/configure.ac | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/configure b/gcc/configure index 817d765568e..731424d62dc 100755 --- a/gcc/configure +++ b/gcc/configure @@ -3333,6 +3333,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_headers="$ac_config_headers auto-host.h:config.in" @@ -19689,7 +19690,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19692 "configure" +#line 19693 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19795,7 +19796,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19798 "configure" +#line 19799 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 59f205a1781..f61fe5a13a5 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -25,6 +25,7 @@ AC_INIT AC_CONFIG_SRCDIR(tree.cc) +AC_CONFIG_MACRO_DIRS([../config] [..]) AC_CONFIG_HEADER(auto-host.h:config.in) gcc_version=`cat $srcdir/BASE-VER` diff --git a/libobjc/configure b/libobjc/configure index 2dcc9cd32f6..b888584feb8 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -2218,6 +2218,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -10771,7 +10772,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10774 "configure" +#line 10775 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10877,7 +10878,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10880 "configure" +#line 10881 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libobjc/configure.ac b/libobjc/configure.ac index f8f577cfbef..6f58a45d4cb 100644 --- a/libobjc/configure.ac +++ b/libobjc/configure.ac @@ -20,6 +20,7 @@ AC_INIT(package-unused, version-unused,, libobjc) AC_CONFIG_SRCDIR([objc/objc.h]) +AC_CONFIG_MACRO_DIRS([../config] [..]) GCC_TOPLEV_SUBDIRS # We need the following definitions because AC_PROG_LIBTOOL relies on them -- 2.35.1