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

diff --git a/configure b/configure
index 38d8027df1b6c1db4f4597bdb090e007dfeb4199..a037ca00b49dd17b8eb8c01133e6a3e6725a123d 100755 (executable)
--- a/configure
+++ b/configure
@@ -218,7 +218,7 @@ if (defined $opt_library_dir)
 {
        $config{LIBRARY_DIR} = $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)
 {
 
 if (defined $opt_freebsd_port)
 {

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 88c70f5cc281246d4e8a8692a66059f038ab5cd4..6c6dab11fade59a6b414e7fc236a45f3ad389365 100644 (file)
--- 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 */
 #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) */
 /* $ModDep: transport.h */
 /* $CopyInstall: conf/key.pem $(CONPATH) */
 /* $CopyInstall: conf/cert.pem $(CONPATH) */