diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_ircv3_capnotify.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -297,8 +297,8 @@ if (prompt_bool $interactive, $question, 0) { } else { # TODO: finish modulemanager rewrite and replace this code with: # system './modulemanager', 'enable', '--auto'; - enable_extras 'm_ssl_gnutls.cpp' unless system 'gnutls-cli --version >/dev/null 2>&1'; - enable_extras 'm_ssl_openssl.cpp' unless system 'openssl --version >/dev/null 2>&1'; + enable_extras 'm_ssl_gnutls.cpp' unless system 'pkg-config --exists gnutls >/dev/null 2>&1'; + enable_extras 'm_ssl_openssl.cpp' unless system 'pkg-config --exists openssl >/dev/null 2>&1'; } # Generate SSL certificates. diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 716a736f8..10b97b359 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -28,7 +28,7 @@ // Fix warnings about the use of commas at end of enumerator lists on C++03. #if defined __clang__ # pragma clang diagnostic ignored "-Wc++11-extensions" -#elif defined __GNUC__ +#elif defined __GNUC__ && __GNUC__ < 6 # pragma GCC diagnostic ignored "-pedantic" #endif @@ -58,8 +58,8 @@ # pragma comment(lib, "libgnutls-28.lib") #endif -/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") eval("print `libgcrypt-config --cflags | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */ -/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") eval("print `libgcrypt-config --libs | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */ +/* $CompileFlags: -std=c++03 pkgconfincludes("gnutls","/gnutls/gnutls.h","") eval("print `libgcrypt-config --cflags | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */ +/* $LinkerFlags: -std=c++03 rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") eval("print `libgcrypt-config --libs | tr -d \r` if `pkg-config --modversion gnutls 2>/dev/null | tr -d \r` lt '2.12'") */ // These don't exist in older GnuTLS versions #if INSPIRCD_GNUTLS_HAS_VERSION(2, 1, 7) diff --git a/src/modules/m_ircv3_capnotify.cpp b/src/modules/m_ircv3_capnotify.cpp index b19c2665d..93c30df12 100644 --- a/src/modules/m_ircv3_capnotify.cpp +++ b/src/modules/m_ircv3_capnotify.cpp @@ -54,7 +54,7 @@ class ModuleIRCv3CapNotify : public Module, public Cap::EventListener, public Re void Send(const std::string& capname, Cap::Capability* cap, bool add) { - std::string msg = (add ? "ADD :" : "DEL :"); + std::string msg = (add ? "NEW :" : "DEL :"); msg.append(capname); std::string msgwithval = msg; msgwithval.push_back('='); |