gdb: initialise extension languages after processing early startup files

[deliverable/binutils-gdb.git] / sim / erc32 / configure.ac

diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 8b430d9e95a745fcf06c543fce9fa3109b0f6198..cf7ec5fdb8033e7f80be0af6c585961d4293c722 100644 (file)
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright (C) 1996-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2021 Free Software Foundation, Inc.
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -14,11 +14,11 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
 AC_INIT(Makefile.in)
-sinclude(../common/acinclude.m4)
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
+SIM_AC_OPTION_WARNINGS(no)
 
 # In the Cygwin environment, we need some additional flags.
 AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
@@ -27,22 +27,24 @@ AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
 lose
 #endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
 
+# Keep in sync with gdb's configure.ac list.
+AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses],
+  [TERMCAP=$ac_cv_search_tgetent], [TERMCAP=""])
 if test x$sim_cv_os_cygwin = xyes; then
-  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
-else
-  # Keep in sync with gdb's configure.ac list.
-  AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses],
-    [TERMCAP=$ac_cv_search_tgetent], [TERMCAP=""])
+  TERMCAP="${TERMCAP} -luser32"
 fi
 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
+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
 else
   AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
               AC_ERROR([the required "readline" library is missing]), $TERMCAP)
+  READLINE_CFLAGS=
 fi
 AC_SUBST(READLINE)
+AC_SUBST(READLINE_CFLAGS)
 SIM_AC_OUTPUT