izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COND_THIRD_POLL _overrides_ broken system poll; does not add to it.

Browse Source 
Fixes OS X 10.6 problem from 7fe9f29.
This commit is contained in:
Keith Winstein
2012-04-25 02:12:59 -04:00
parent 072863f0b9
commit d5051569b8
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/examples/Makefile.am
+13 -10
View File
@@ -4,8 +4,11 @@ if COND_THIRD_LIBSTDDJB
STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb
endif endif
if COND_THIRD_POLL if COND_THIRD_POLL
poll_LIBS += $(top_builddir)/third/poll/libpoll.a working_poll_LIBS = $(top_builddir)/third/poll/libpoll.a
poll_CFLAGS += -I$(top_srcdir)/third/poll working_poll_CFLAGS = -I$(top_srcdir)/third/poll
else
working_poll_LIBS = $(poll_LIBS)
working_poll_CFLAGS = $(poll_CFLAGS)
endif endif
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
@@ -24,17 +27,17 @@ decrypt_CPPFLAGS = -I$(srcdir)/../crypto
decrypt_LDADD = ../crypto/libmoshcrypto.a decrypt_LDADD = ../crypto/libmoshcrypto.a
parse_SOURCES = parse.cc parse_SOURCES = parse.cc
parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util $(poll_CFLAGS) parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util $(working_poll_CFLAGS)
parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil $(poll_LIBS) parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil $(working_poll_LIBS)
termemu_SOURCES = termemu.cc termemu_SOURCES = termemu.cc
termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs $(STDDJB_CPPFLAGS) $(poll_CFLAGS) termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs $(STDDJB_CPPFLAGS) $(working_poll_CFLAGS)
termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(STDDJB_LDFLAGS) $(TINFO_LIBS) $(protobuf_LIBS) $(poll_LIBS) termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(STDDJB_LDFLAGS) $(TINFO_LIBS) $(protobuf_LIBS) $(working_poll_LIBS)
ntester_SOURCES = ntester.cc ntester_SOURCES = ntester.cc
ntester_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs $(poll_CFLAGS) $(protobuf_CFLAGS) ntester_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs $(working_poll_CFLAGS) $(protobuf_CFLAGS)
ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a $(poll_LIBS) -lutil -lm $(protobuf_LIBS) ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a $(working_poll_LIBS) -lutil -lm $(protobuf_LIBS)
benchmark_SOURCES = benchmark.cc benchmark_SOURCES = benchmark.cc
benchmark_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I../protobufs -I$(srcdir)/../frontend -I$(srcdir)/../crypto -I$(srcdir)/../network $(STDDJB_CPPFLAGS) $(poll_CFLAGS) $(protobuf_CFLAGS) benchmark_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I../protobufs -I$(srcdir)/../frontend -I$(srcdir)/../crypto -I$(srcdir)/../network $(STDDJB_CPPFLAGS) $(working_poll_CFLAGS) $(protobuf_CFLAGS)
benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(STDDJB_LDFLAGS) $(poll_LIBS) -lutil -lm $(TINFO_LIBS) $(protobuf_LIBS) benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(STDDJB_LDFLAGS) $(working_poll_LIBS) -lutil -lm $(TINFO_LIBS) $(protobuf_LIBS)
src/frontend/Makefile.am
+7 -4
View File
@@ -4,14 +4,17 @@ if COND_THIRD_LIBSTDDJB
STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb
endif endif
if COND_THIRD_POLL if COND_THIRD_POLL
poll_LIBS += $(top_builddir)/third/poll/libpoll.a working_poll_LIBS = $(top_builddir)/third/poll/libpoll.a
poll_CFLAGS += -I$(top_srcdir)/third/poll working_poll_CFLAGS = -I$(top_srcdir)/third/poll
else
working_poll_LIBS = $(poll_LIBS)
working_poll_CFLAGS = $(poll_CFLAGS)
endif endif
AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(STDDJB_CPPFLAGS) $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(poll_CFLAGS) AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(STDDJB_CPPFLAGS) $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(working_poll_CFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
AM_LDFLAGS = $(HARDEN_LDFLAGS) AM_LDFLAGS = $(HARDEN_LDFLAGS)
LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a $(STDDJB_LDFLAGS) $(poll_LIBS) -lm $(TINFO_LIBS) $(protobuf_LIBS) LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a $(STDDJB_LDFLAGS) $(working_poll_LIBS) -lm $(TINFO_LIBS) $(protobuf_LIBS)
mosh_server_LDADD = $(LDADD) -lutil mosh_server_LDADD = $(LDADD) -lutil