diff options
| author | Gordon Sim <gsim@apache.org> | 2010-07-16 08:31:27 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2010-07-16 08:31:27 +0000 |
| commit | 838604b8c62ea9c062d9749a9f3bf8f2d10bd0b2 (patch) | |
| tree | 68ee753f4c588e39bb6dba590dfc8428a83b67df /qpid/cpp/src | |
| parent | 27a46e6c6603a5c7527c9e84176025f80bb16d69 (diff) | |
| download | qpid-python-838604b8c62ea9c062d9749a9f3bf8f2d10bd0b2.tar.gz | |
Fix cmake build to correctly enable sasl if libs are detected.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@964709 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | qpid/cpp/src/config.h.cmake | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 67d18e42df..c72a8964ff 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -458,19 +458,19 @@ else (NOT CLOCK_GETTIME_IN_RT) endif (NOT CLOCK_GETTIME_IN_RT) # See if Cyrus SASL is desired and available -CHECK_LIBRARY_EXISTS (sasl2 sasl_checkpass "" HAVE_SASL2) +CHECK_LIBRARY_EXISTS (sasl2 sasl_checkpass "" HAVE_SASL) CHECK_INCLUDE_FILES (sasl/sasl.h HAVE_SASL_H) set (sasl_default ${sasl_force}) -if (HAVE_SASL2 AND HAVE_SASL_H) +if (HAVE_SASL AND HAVE_SASL_H) set (sasl_default ON) -endif (HAVE_SASL2 AND HAVE_SASL_H) +endif (HAVE_SASL AND HAVE_SASL_H) option(BUILD_SASL "Build with Cyrus SASL support" ${sasl_default}) if (BUILD_SASL) - if (NOT HAVE_SASL2) + if (NOT HAVE_SASL) message(FATAL_ERROR "Cyrus SASL support requested but libsasl2 not found") - endif (NOT HAVE_SASL2) + endif (NOT HAVE_SASL) if (NOT HAVE_SASL_H) message(FATAL_ERROR "Cyrus SASL support requested but sasl.h not found") endif (NOT HAVE_SASL_H) diff --git a/qpid/cpp/src/config.h.cmake b/qpid/cpp/src/config.h.cmake index 06eacd85d7..2bb84c6e47 100644 --- a/qpid/cpp/src/config.h.cmake +++ b/qpid/cpp/src/config.h.cmake @@ -54,11 +54,8 @@ #cmakedefine QPID_HAS_CLOCK_GETTIME -#cmakedefine QPID_HAS_SASL #cmakedefine BROKER_SASL_NAME "${BROKER_SASL_NAME}" -#ifdef QPID_HAS_SASL -# define HAVE_SASL 1 -#endif +#cmakedefine HAVE_SASL ${HAVE_SASL} #cmakedefine HAVE_OPENAIS_CPG_H ${HAVE_OPENAIS_CPG_H} #cmakedefine HAVE_COROSYNC_CPG_H ${HAVE_COROSYNC_CPG_H} |