Merge pull request #7658 from Habbie/uuid-for-everyone

always link in uuid-utils because webserver logging needs it now

diff --combined pdns/recursordist/Makefile.am
index 64adc379ad0a42ddbdde6e9d10fb09af8288bffa,3a7e39bdcd92b427bb83727cad2eef7242509563..2d7052b1b1c15e1c9413189603e5f71335a162e1
--- 1/pdns/recursordist/Makefile.am
--- 2/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@@ -168,6 -168,7 +168,7 @@@ pdns_recursor_SOURCES = 
        ueberbackend.hh \
        unix_utility.cc \
        utility.hh \
+       uuid-utils.hh uuid-utils.cc \
        validate.cc validate.hh validate-recursor.cc validate-recursor.hh \
        version.cc version.hh \
        webserver.cc webserver.hh \
@@@ -235,7 -236,6 +236,7 @@@ testrunner_SOURCES = 
        nsecrecords.cc \
        pdnsexception.hh \
        opensslsigners.cc opensslsigners.hh \
 +      pollmplexer.cc \
        protobuf.cc protobuf.hh \
        qtype.cc qtype.hh \
        rcpgenerator.cc \
@@@ -264,7 -264,6 +265,7 @@@
        test-ixfr_cc.cc \
        test-misc_hh.cc \
        test-mtasker.cc \
 +      test-mplexer.cc \
        test-negcache_cc.cc \
        test-packetcache_hh.cc \
        test-rcpgenerator_cc.cc \
@@@ -337,21 -336,16 +338,21 @@@ endi
  
  if HAVE_FREEBSD
  pdns_recursor_SOURCES += kqueuemplexer.cc
 +testrunner_SOURCES += kqueuemplexer.cc
  endif
  
  if HAVE_LINUX
  pdns_recursor_SOURCES += epollmplexer.cc
 +testrunner_SOURCES += epollmplexer.cc
  endif
  
  if HAVE_SOLARIS
  pdns_recursor_SOURCES += \
        devpollmplexer.cc \
        portsmplexer.cc
 +testrunner_SOURCES += \
 +      devpollmplexer.cc \
 +      portsmplexer.cc
  endif
  
  if HAVE_PROTOBUF
@@@ -369,10 -363,6 +370,6 @@@ testrunner_LDADD += $(PROTOBUF_LIBS
  testrunner$(OBJEXT): dnsmessage.pb.cc
  
  endif
- 
- pdns_recursor_SOURCES += \
-       uuid-utils.hh uuid-utils.cc
- 
  endif
  
  rec_control_SOURCES = \