Merge branch 'maint'

* maint:
  Remove stale servers
  Add irc.nordunet.se
  Use quotes for config.h to handle experimental build.mk

doc/UPDATES.md

@@ -4,6 +4,7 @@
 # maint
   * Fix various compile warnings
   * Fix ptrace detection on OpenBSD (after 1.4.6 regression for the Linux fix)
+  * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
 
 # 1.4.8
   * Support Debian/Ubuntu's libssl1.0.0[:i386] package.

doc/settings.txt

@@ -19,42 +19,38 @@ irc.choopa.net
 irc.colosolutions.net
 irc.mzima.net
 irc.servercentral.net
-irc.umich.edu
 irc2.choopa.net
 #EU
 efnet.port80.se
 efnet.portlane.se
-irc.ac.za
 irc.du.se
 irc.efnet.fr
-irc.efnet.pl
 irc.homelien.no
 irc.inet.tele.dk
 irc.underworld.no
-#CA
-irc.teksavvy.ca
+irc.nordunet.se
 
 :servers6
 efnet.ipv6.port80.se
 efnet.portlane.se
-irc.ac.za
 irc.choopa.net
 irc.inet.tele.dk
 irc.ipv6.homelien.no
 irc.underworld.no
-irc.teksavvy.ca
+irc.nordunet.se
 
 :servers_ssl
 irc.choopa.net:9999
 irc.servercentral.net:9999
-irc.umich.edu:9999
 irc.underworld.no
+irc.nordunet.se
 
 :servers6_ssl
 irc.choopa.net:9999
 irc.underworld.no
 irc.ipv6.homelien.no
 efnet.ipv6.port80.se
+irc.nordunet.se
 
 :rbl
 dnsbl.proxybl.org

src/compat/memmem.c

@@ -29,7 +29,9 @@
 #include <sys/types.h>
 /* $FreeBSD: head/lib/libc/string/memmem.c 188080 2009-02-03 17:58:20Z danger $ */
 #include <string.h>
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #ifndef HAVE_MEMMEM
 /*