commit | c128d5e0edcf0259dab850e440004904bde31808 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Thu Sep 03 14:13:03 2009 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Thu Sep 03 14:13:03 2009 -0700 |
tree | 22176c1664c4f5aa3f47fa506f7c2445fd627fa1 | |
parent | e1542198c8ea4d244fbd7e97c22b02abff1ca850 [diff] | |
parent | 07a39f12058ddbc9bcf9200e4d5883e4f4b6fd95 [diff] |
merge from donut
diff --git a/dist/Android.mk b/dist/Android.mk index b7aad30..c470bfe 100644 --- a/dist/Android.mk +++ b/dist/Android.mk
@@ -100,10 +100,13 @@ LOCAL_CFLAGS += -DHAVE_READLINE=1 endif -LOCAL_LDLIBS += -lpthread -ldl +LOCAL_LDLIBS += -lpthread +ifneq ($(HOST_OS),freebsd) +LOCAL_LDLIBS += -ldl +endif ifneq ($(strip $(have_readline)),) -LOCAL_LDLIBS += -lreadline +LOCAL_LDLIBS += -lreadline -lncurses endif ifneq ($(strip $(have_history)),) LOCAL_LDLIBS += -lhistory