From d5051569b84cb2057334bbbefc0bd4e6119a874f Mon Sep 17 00:00:00 2001 From: Keith Winstein Date: Wed, 25 Apr 2012 02:12:59 -0400 Subject: [PATCH] COND_THIRD_POLL _overrides_ broken system poll; does not add to it. Fixes OS X 10.6 problem from 7fe9f29. --- src/examples/Makefile.am | 23 +++++++++++++---------- src/frontend/Makefile.am | 11 +++++++---- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index b17822a..872c176 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -4,8 +4,11 @@ if COND_THIRD_LIBSTDDJB STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb endif if COND_THIRD_POLL - poll_LIBS += $(top_builddir)/third/poll/libpoll.a - poll_CFLAGS += -I$(top_srcdir)/third/poll + working_poll_LIBS = $(top_builddir)/third/poll/libpoll.a + working_poll_CFLAGS = -I$(top_srcdir)/third/poll +else + working_poll_LIBS = $(poll_LIBS) + working_poll_CFLAGS = $(poll_CFLAGS) endif AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) @@ -24,17 +27,17 @@ decrypt_CPPFLAGS = -I$(srcdir)/../crypto decrypt_LDADD = ../crypto/libmoshcrypto.a parse_SOURCES = parse.cc -parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util $(poll_CFLAGS) -parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil $(poll_LIBS) +parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util $(working_poll_CFLAGS) +parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil $(working_poll_LIBS) termemu_SOURCES = termemu.cc -termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs $(STDDJB_CPPFLAGS) $(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_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) $(working_poll_LIBS) 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_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a $(poll_LIBS) -lutil -lm $(protobuf_LIBS) +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 $(working_poll_LIBS) -lutil -lm $(protobuf_LIBS) 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_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_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) $(working_poll_LIBS) -lutil -lm $(TINFO_LIBS) $(protobuf_LIBS) diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index a0f9df2..8aa8eaf 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -4,14 +4,17 @@ if COND_THIRD_LIBSTDDJB STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb endif if COND_THIRD_POLL - poll_LIBS += $(top_builddir)/third/poll/libpoll.a - poll_CFLAGS += -I$(top_srcdir)/third/poll + working_poll_LIBS = $(top_builddir)/third/poll/libpoll.a + working_poll_CFLAGS = -I$(top_srcdir)/third/poll +else + working_poll_LIBS = $(poll_LIBS) + working_poll_CFLAGS = $(poll_CFLAGS) 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_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