X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Ferc32%2Fconfigure.ac;h=bc460917784fbe50b021e041ad9762d1c9cffa7e;hb=b909d38dfa0fd09dcbcead07b61e5ba3fedd6f7a;hp=976b595807163cd297598587f9aacb94467ecee0;hpb=f05692463ca14b5fb6bbe4e207db0b2c73da963b;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 976b595807..bc46091778 100644
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
 AC_INIT(Makefile.in)
+sinclude(../common/acinclude.m4)
 
-sinclude(../common/common.m4)
-sinclude(../common/aclocal.m4)
+SIM_AC_COMMON
 
 AC_CHECK_HEADERS(stdlib.h)
 
@@ -17,8 +17,19 @@ lose
 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
-  AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
+  # Keep in sync with gdb's configure.ac list.
+  AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses],
+    [TERMCAP=$ac_cv_search_tgetent], [TERMCAP=""])
 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
+else
+  AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
+	       AC_ERROR([the required "readline" library is missing]), $TERMCAP)
+fi
+AC_SUBST(READLINE)
 SIM_AC_OUTPUT