qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r964709 - in /qpid/trunk/qpid/cpp/src: CMakeLists.txt config.h.cmake
Date Fri, 16 Jul 2010 08:31:27 GMT
Author: gsim
Date: Fri Jul 16 08:31:27 2010
New Revision: 964709

URL: http://svn.apache.org/viewvc?rev=964709&view=rev
Log:
Fix cmake build to correctly enable sasl if libs are detected.

Modified:
    qpid/trunk/qpid/cpp/src/CMakeLists.txt
    qpid/trunk/qpid/cpp/src/config.h.cmake

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=964709&r1=964708&r2=964709&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Jul 16 08:31:27 2010
@@ -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)

Modified: qpid/trunk/qpid/cpp/src/config.h.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/config.h.cmake?rev=964709&r1=964708&r2=964709&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/config.h.cmake (original)
+++ qpid/trunk/qpid/cpp/src/config.h.cmake Fri Jul 16 08:31:27 2010
@@ -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}



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message