diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-06-03 04:05:58 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-06-03 04:05:58 +0000 |
| commit | 746f63b2feb4646977ae29f53fb54b0d1e7a85ea (patch) | |
| tree | e280ca4e4f8a4a4590e19dd90149dd419da19d7d | |
| parent | 20002aa04929d5a9ea71ad6e9a11654357065505 (diff) | |
Use pkg-config to search for gnutls rather than the now-removed libgnutls-config
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11400 e03df62e-2008-0410-955e-edbf42e46eb7
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -218,7 +218,7 @@ if (defined $opt_library_dir) { $config{LIBRARY_DIR} = $opt_library_dir; } -chomp($config{HAS_GNUTLS} = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. +chomp($config{HAS_GNUTLS} = `pkg-config --modversion gnutls 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. if (defined $opt_freebsd_port) { diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 88c70f5cc..6c6dab11f 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -22,8 +22,8 @@ #endif /* $ModDesc: Provides SSL support for clients */ -/* $CompileFlags: exec("libgnutls-config --cflags") */ -/* $LinkerFlags: rpath("libgnutls-config --libs") exec("libgnutls-config --libs") */ +/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */ +/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */ /* $ModDep: transport.h */ /* $CopyInstall: conf/key.pem $(CONPATH) */ /* $CopyInstall: conf/cert.pem $(CONPATH) */ |