X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Ferc32%2Fconfigure.ac;h=c33ce789ebe989ec743ad4d5f2613e7c4115141a;hb=6ffe910a7e62888428dfe53168a5383dd3daf689;hp=f1aeadac36defd888d2f25c49d97e7c1b0798041;hpb=35695fd6e5451726c124a1048a7f260f02cbcd1e;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index f1aeadac36..c33ce789eb 100644
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -1,13 +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)
-AC_CONFIG_HEADER(config.h:config.in)
-
 sinclude(../common/aclocal.m4)
 
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
 
 AC_CHECK_HEADERS(stdlib.h)
 
@@ -25,4 +21,13 @@ else
 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