From 0d6875b8be16a5f709d8414abd356efb6eea3844 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Sat, 17 Mar 2012 07:15:55 -0400 Subject: [PATCH] Don't pass -lutil when linking mosh-client On Android we lack libutil, and we configure with --disable-server. --- src/frontend/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index 7591c96..1f86d21 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(BOOST_CPPFLAGS) $(protobuf_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe -LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lutil -lm $(protobuf_LIBS) +LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(protobuf_LIBS) if COND_THIRD_LIBSTDDJB AM_CPPFLAGS += -I$(top_srcdir)/third/libstddjb LDADD += $(top_builddir)/third/libstddjb/libstddjb.a @@ -9,6 +9,8 @@ else LDADD += $(STDDJB_LDFLAGS) endif +mosh_server_LDADD = $(LDADD) -lutil + bin_PROGRAMS = if BUILD_CLIENT