diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | src/frontend/Makefile.am | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 8f61543..e734cc9 100644 --- a/configure.ac +++ b/configure.ac @@ -304,11 +304,6 @@ if ( pollfds[ 0 ].revents & (POLLERR | POLLHUP | POLLNVAL) ) { LIBS="$save_LIBS" ]) AM_CONDITIONAL([COND_THIRD_POLL], [test "x$ac_cv_poll_pty" = "xno"]) -AM_COND_IF([COND_THIRD_POLL], - [ - poll_CFLAGS="-I\$(top_srcdir)/third/poll" - poll_LIBS="\$(top_builddir)/third/poll/libpoll.a" - ]) AC_MSG_CHECKING([whether pipe2(..., O_CLOEXEC) is supported]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index 1a217c9..b17822a 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -3,6 +3,10 @@ if COND_THIRD_LIBSTDDJB STDDJB_LDFLAGS += $(top_builddir)/third/libstddjb/libstddjb.a 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 +endif AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) AM_LDFLAGS = $(HARDEN_LDFLAGS) diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index 673b348..a0f9df2 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -3,6 +3,10 @@ if COND_THIRD_LIBSTDDJB STDDJB_LDFLAGS += $(top_builddir)/third/libstddjb/libstddjb.a 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 +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_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) |