From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 28 Jan 2015 18:19:40 +0000 (+0100)
Subject: Build devpoll and ports mplexer in on Solaris
X-Git-Tag: rec-3.7.0-rc2~16^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4c30a7597e765fa04558e5337bbb9d7506429d9;p=pdns

Build devpoll and ports mplexer in on Solaris
---

diff --git a/configure.ac b/configure.ac
index 73f2c59e5..cb9998237 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,12 +140,14 @@ case "$host_os" in
 solaris2.10)
   LIBS="-lposix4 -lpthread -lrt $LIBS"
   CXXFLAGS="-D_REENTRANT $CXXFLAGS"
+  have_solaris="yes"
   ;;
 solaris2.8 | solaris2.9 )
   AC_DEFINE(NEED_POSIX_TYPEDEF,,[If POSIX typedefs need to be defined])
   AC_DEFINE(NEED_INET_NTOP_PROTO,,[If your OS is so broken that it needs an additional prototype])
   LIBS="-lposix4 -lpthread $LIBS"
   CXXFLAGS="-D_REENTRANT $CXXFLAGS"
+  have_solaris="yes"
   ;;
 linux*)
   THREADFLAGS="-pthread"
@@ -167,6 +169,7 @@ esac
 
 AM_CONDITIONAL([HAVE_FREEBSD], [test "x$have_freebsd" = "xyes"])
 AM_CONDITIONAL([HAVE_LINUX], [test "x$have_linux" = "xyes"])
+AM_CONDITIONAL([HAVE_SOLARIS], [test "x$have_solaris" = "xyes"])
 
 AC_SUBST(THREADFLAGS)
 AC_SUBST([DYNLINKFLAGS], [-export-dynamic])
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 76ff42f83..e92434e7e 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -987,6 +987,12 @@ if HAVE_LINUX
 pdns_recursor_SOURCES += epollmplexer.cc
 endif
 
+if HAVE_SOLARIS
+pdns_recursor_SOURCES += \
+	devpollmplexer.cc \
+	portsmplexer.cc
+endif
+
 pdns_control_SOURCES = \
 	arguments.cc \
 	dynloader.cc \