diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-08 11:07:46 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-12-08 11:07:46 -0800 |
| commit | ebb36d56c732ffe9cdb8d2ea53d00e1d4ece8f97 (patch) | |
| tree | 46b321232b9b56cb77d538c49293073d20bdd241 /ao-tools/ao-dbg | |
| parent | 5fd0dc6f69e7614ba71bbc215b32260a11595af3 (diff) | |
ao-tools: Allow building without stlink and readline
This adds --without-stlink and --without-readline options to configure
to disable these features, and adjusts the build process and code to
handle that.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'ao-tools/ao-dbg')
| -rw-r--r-- | ao-tools/ao-dbg/Makefile.am | 2 | ||||
| -rw-r--r-- | ao-tools/ao-dbg/ao-dbg-main.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ao-tools/ao-dbg/Makefile.am b/ao-tools/ao-dbg/Makefile.am index ad2cb280..2c33cf06 100644 --- a/ao-tools/ao-dbg/Makefile.am +++ b/ao-tools/ao-dbg/Makefile.am @@ -7,6 +7,6 @@ man_MANS = ao-dbg.1 ao_dbg_DEPENDENCIES = $(AO_DBG_LIBS) -ao_dbg_LDADD=$(AO_DBG_LIBS) $(LIBUSB_LIBS) -lreadline +ao_dbg_LDADD=$(AO_DBG_LIBS) $(LIBUSB_LIBS) $(LIBREADLINE) ao_dbg_SOURCES = ao-dbg-parse.c ao-dbg-command.c ao-dbg-main.c diff --git a/ao-tools/ao-dbg/ao-dbg-main.c b/ao-tools/ao-dbg/ao-dbg-main.c index 21b83a3d..25eca54b 100644 --- a/ao-tools/ao-dbg/ao-dbg-main.c +++ b/ao-tools/ao-dbg/ao-dbg-main.c @@ -16,6 +16,10 @@ * 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> @@ -204,13 +208,16 @@ s51_putc(int c) 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; @@ -221,7 +228,9 @@ s51_read_line(char *line, int len) line[len-1] = '\0'; add_history(r); return 1; - } else { + } else +#endif + { if (s51_prompt) s51_printf("%s", s51_prompt); else |