diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-01-21 16:29:48 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-01-21 16:29:48 +0000 |
| commit | 25608bd1add6a94bdc093f017a7aab0de48d3c45 (patch) | |
| tree | b36847b09d345d02afc9c818f06d96afd9c923fb | |
| parent | 06accbbabaa1a5f83f4e39b1246c72bceeb761e8 (diff) | |
Add check for openssl >= 0.9.7, and fix for if the library cant be found at all
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6424 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | make/utilities.pm | 5 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_openssl.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/make/utilities.pm b/make/utilities.pm index 7a45ebb3e..532c09096 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -198,8 +198,11 @@ sub pkgconfig_check_version($$;$) return 0; } } + # If we didnt find it, we cant definitively say its too old. + # Return ok, and let pkgconflibs() or pkgconfincludes() pick up + # the missing library later on. print "\033[1;32mNo (not found)\033[0m\n"; - return 0; + return 1; } sub pkgconfig_get_lib_dirs($$$;$) diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 72ceea4d0..957f1ba3c 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -30,7 +30,7 @@ #include "transport.h" /* $ModDesc: Provides SSL support for clients */ -/* $CompileFlags: pkgconfincludes("openssl","/openssl/ssl.h","") */ +/* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */ /* $LinkerFlags: pkgconflibs("openssl","/libssl.so","-lssl -lcrypto") */ /* $ModDep: transport.h */ |