diff options
| author | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-08-21 06:01:35 +0200 |
|---|---|---|
| committer | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-08-21 06:01:35 +0200 |
| commit | f18ad4d3f3e80f640f3d122b0e94d74c9bae0068 (patch) | |
| tree | 467fc2c4c5fc88540fbd970f22679effb9e1417d /net-libs/libssh/files | |
| parent | 6138fd65834e457d6425e592996cf5f4022d246b (diff) | |
| download | kde-f18ad4d3f3e80f640f3d122b0e94d74c9bae0068.tar.gz kde-f18ad4d3f3e80f640f3d122b0e94d74c9bae0068.tar.bz2 kde-f18ad4d3f3e80f640f3d122b0e94d74c9bae0068.zip | |
[net-libs/libssh] 0.3.3 Version bump (required for sftp kioslave support in KDE 4.4)
Diffstat (limited to 'net-libs/libssh/files')
| -rw-r--r-- | net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch b/net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch new file mode 100644 index 00000000000..e786ddd0f8c --- /dev/null +++ b/net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch @@ -0,0 +1,37 @@ +=== modified file 'CMakeLists.txt' +--- CMakeLists.txt 2009-05-25 19:43:46 +0000 ++++ CMakeLists.txt 2009-05-25 19:54:56 +0000 +@@ -38,14 +38,24 @@ + # search for libraries + find_package(ZLIB REQUIRED) + +-find_package(OpenSSL) +- +-if (NOT CRYPTO_FOUND) +- find_package(GCrypt) +- if (NOT GCRYPT_FOUND) +- message(FATAL_ERROR "Could not find OpenSSL or GCrypt") +- endif (NOT GCRYPT_FOUND) +-endif (NOT CRYPTO_FOUND) ++option(WITH_GCRYPT "Prefer GCcrypt over OpenSSL" "AUTO") ++ ++if (WITH_GCRYPT STREQUAL "AUTO") ++ find_package(OpenSSL) ++ if (NOT CRYPTO_FOUND) ++ find_package(GCrypt) ++ endif (NOT CRYPTO_FOUND) ++else () ++ if (WITH_GCRYPT) ++ find_package(GCrypt) ++ else (WITH_GCRYPT) ++ find_package(OpenSSL) ++ endif (WITH_GCRYPT) ++endif (WITH_GCRYPT STREQUAL "AUTO") ++ ++if (NOT CRYPTO_FOUND AND NOT GCRYPT_FOUND) ++ message(FATAL_ERROR "Could not find OpenSSL or GCrypt") ++endif (NOT CRYPTO_FOUND AND NOT GCRYPT_FOUND) + + # config.h checks + include(ConfigureChecks.cmake) + |
