* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ao-dbg.h"
#include <unistd.h>
#include <sys/types.h>
putc(c, s51_output);
}
+#if HAVE_LIBREADLINE
#include <readline/readline.h>
#include <readline/history.h>
+#endif
int
s51_read_line(char *line, int len)
{
int ret;
+#if HAVE_LIBREADLINE
if (s51_output == stdout && s51_input == stdin && s51_prompt) {
char *r;
line[len-1] = '\0';
add_history(r);
return 1;
- } else {
+ } else
+#endif
+ {
if (s51_prompt)
s51_printf("%s", s51_prompt);
else
-if LIBSTLINK
-
bin_PROGRAMS=ao-elftohex
-LIBSTLINKDIR=/local/src/stlink
-
-AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS)
-AO_STMLOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS)
+AO_ELFTOHEX_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
-ao_elftohex_DEPENDENCIES = $(AO_STMLOAD_LIBS)
+ao_elftohex_DEPENDENCIES = $(AO_ELFTOHEX_LIBS)
-ao_elftohex_LDADD=$(AO_STMLOAD_LIBS) $(LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
+ao_elftohex_LDADD=$(AO_ELFTOHEX_LIBS) -lelf
ao_elftohex_SOURCES=ao-elftohex.c
man_MANS = ao-elftohex.1
-
-endif
bin_PROGRAMS=ao-stmload
-LIBSTLINKDIR=/local/src/stlink
-
-AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS)
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(STLINK_CFLAGS) $(LIBUSB_CFLAGS)
AO_STMLOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
ao_stmload_DEPENDENCIES = $(AO_STMLOAD_LIBS)
-ao_stmload_LDADD=$(AO_STMLOAD_LIBS) $(LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
+ao_stmload_LDADD=$(AO_STMLOAD_LIBS) $(STLINK_LIBS) $(LIBUSB_LIBS) -lelf
ao_stmload_SOURCES=ao-stmload.c ao-stmload.h
VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
AC_SUBST(VERSION_DASH)
-
dnl ==========================================================================
dnl Java library versions
AC_MSG_ERROR([Please install nickle to build AltOs])
fi
-AC_CHECK_LIB(readline, readline)
+AC_ARG_WITH([readline],
+ [AS_HELP_STRING([--with-readline],
+ [enable readline functionality in ao-dbg @<:@default=auto@:>@])],
+ [],
+ [with_readline=auto])
+
+LIBREADLINE_LIBS=
+
+if test x"$with_readline" != "xno"; then
+ AC_CHECK_LIB([readline], [main],
+ [AC_SUBST([LIBREADLINE], ["-lreadline -lncurses"])
+ AC_DEFINE([HAVE_LIBREADLINE], [1],
+ [Define if you have libreadline])],
+ [if test "x$with_readline" != xauto; then
+ AC_MSG_ERROR([--with-readline was given, but test for readline failed])
+ fi],
+ -lncurses)
+fi
PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
AC_CHECK_HEADERS(libelf.h libelf/libelf.h, [break])
AC_CHECK_HEADERS(gelf.h libelf/gelf.h, [break])
-PKG_CHECK_MODULES([LIBSTLINK], [stlink], [HAVE_STLINK=yes], [HAVE_STLINK=no])
+AC_ARG_WITH([stlink],
+ [AS_HELP_STRING([--with-stlink],
+ [Build tools that use the stlink library (default: auto)])],
+ [],
+ [with_stlink=auto])
+
+if test x"$with_stlink" != "xno"; then
+ PKG_CHECK_MODULES([STLINK], [stlink], [HAVE_STLINK=yes], [HAVE_STLINK=no])
+ if test x"$HAVE_STLINK" = "xno" -a x"$with_stlink" != "xauto"; then
+ AC_MSG_ERROR([--with-stlink was given, but stlink was not found])
+ fi
+else
+ HAVE_STLINK=no
+fi
+
+if test x"$HAVE_STLINK" = "xyes"; then
+ AC_DEFINE(HAVE_STLINK,1,[Using STlink library])
+fi
-AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK != xno])
+AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK == xyes])
AC_OUTPUT([
Makefile