From: Ruben Kerkhof Date: Tue, 27 Jan 2015 13:21:56 +0000 (+0100) Subject: Only build epollmultiplexer on Linux X-Git-Tag: rec-3.7.0-rc2~20^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2146%2Fhead;p=thirdparty%2Fpdns.git Only build epollmultiplexer on Linux fixes make -C pdns pdns_recursor on OSX --- diff --git a/configure.ac b/configure.ac index 81a2503d98..e60b25640b 100644 --- a/configure.ac +++ b/configure.ac @@ -149,6 +149,7 @@ solaris2.8 | solaris2.9 ) ;; linux*) THREADFLAGS="-pthread" + have_linux="yes" ;; darwin*) CXXFLAGS="-D__APPLE_USE_RFC_3542 -D_XOPEN_SOURCE $CXXFLAGS" @@ -159,6 +160,8 @@ darwin*) ;; esac +AM_CONDITIONAL([HAVE_LINUX], [test "x$have_linux" = "xyes"]) + AC_SUBST(THREADFLAGS) AC_SUBST([DYNLINKFLAGS], [-export-dynamic]) diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 299159bbce..fe4c4a9fa4 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -948,7 +948,6 @@ pdns_recursor_SOURCES = \ dnsparser.cc \ dnsrecords.cc dnsrecords.hh \ dnswriter.cc dnswriter.hh \ - epollmplexer.cc \ iputils.cc \ json.cc json.hh \ logger.cc \ @@ -993,6 +992,10 @@ if LUA pdns_recursor_LDADD += $(LUA_LIBS) endif +if HAVE_LINUX +pdns_recursor_SOURCES += epollmplexer.cc +endif + pdns_control_SOURCES = \ arguments.cc \ dynloader.cc \