aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2022-09-20 14:27:05 +0200
committerThomas Schwinge <thomas@codesourcery.com>2022-10-20 11:42:46 +0200
commit25861cf3a88a07c8dca3fb32d098c0ad756bbe38 (patch)
tree6290768a96d2446a312539971345dfc9087c10f4
parentdf99e9e42094dee0833ac38f53e7fae09b4d133c (diff)
downloadgcc-25861cf3a88a07c8dca3fb32d098c0ad756bbe38.zip
gcc-25861cf3a88a07c8dca3fb32d098c0ad756bbe38.tar.gz
gcc-25861cf3a88a07c8dca3fb32d098c0ad756bbe38.tar.bz2
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.
-rwxr-xr-xgcc/configure5
-rw-r--r--gcc/configure.ac1
-rwxr-xr-xlibobjc/configure5
-rw-r--r--libobjc/configure.ac1
4 files changed, 8 insertions, 4 deletions
diff --git a/gcc/configure b/gcc/configure
index 2ce51a8..c6def4c 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"
@@ -19713,7 +19714,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 19716 "configure"
+#line 19717 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19819,7 +19820,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 19822 "configure"
+#line 19823 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/gcc/configure.ac b/gcc/configure.ac
index e1ef2ec..45bf756 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 a8fdc64..6da20b8 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
@@ -10795,7 +10796,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10798 "configure"
+#line 10799 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10901,7 +10902,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10904 "configure"
+#line 10905 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/libobjc/configure.ac b/libobjc/configure.ac
index f8f577c..6f58a45 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