Adjust location of readline in sim/erc32

sim/erc32 uses an obsolete path to the in-tree build of readline.
readline was moved into a subdirectory some time ago.  This patch
fixes the problem.  Tested by rebuilding.

sim/erc32/ChangeLog
2021-04-05  Tom Tromey  <tromey@adacore.com>

	* configure: Rebuild.
	* configure.ac (READLINE): Adjust in-tree value.

diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 8b690b16e4fdab97711fcbfdcd77a1d6c155156f..dd8aa42c26292b9e6955b0a50b531f8f8276ca3a 100644 (file)
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-05  Tom Tromey  <tromey@adacore.com>
+
+       * configure: Rebuild.
+       * configure.ac (READLINE): Adjust in-tree value.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/erc32/configure b/sim/erc32/configure
index ec3a2c7873fef51e8e5c72f67e264e5f3a12096c..3f7227b2e7e658d14a83c9e3d48c452c301435d2 100755 (executable)
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -12070,7 +12070,7 @@ fi
 # We prefer the in-tree readline.  Top-level dependencies make sure
 # src/readline (if it's there) is configured before src/sim.
 if test -r ../../readline/Makefile; then
-  READLINE=../../readline/libreadline.a
+  READLINE=../../readline/readline/libreadline.a
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
 $as_echo_n "checking for readline in -lreadline... " >&6; }

diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 0edd6e3e67f276ed4c4d5ced546a90cbbff1eaf6..8b7b688322f19fe308bec4afc237b501479ace89 100644 (file)
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -38,7 +38,7 @@ AC_SUBST(TERMCAP)
 # We prefer the in-tree readline.  Top-level dependencies make sure
 # src/readline (if it's there) is configured before src/sim.
 if test -r ../../readline/Makefile; then
-  READLINE=../../readline/libreadline.a
+  READLINE=../../readline/readline/libreadline.a
 else
   AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
               AC_ERROR([the required "readline" library is missing]), $TERMCAP)