RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 09-Mar-2016 22:27:27
Branch: rpm-5_4 Handle: 2016030921272700
Modified files: (Branch: rpm-5_4)
rpm/rpmio mongoc.c
Log:
- mongoc: permit build without libsasl2.
Summary:
Revision Changes Path
1.1.2.6 +4 -0 rpm/rpmio/mongoc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/mongoc.c
============================================================================
$ cvs diff -u -r1.1.2.5 -r1.1.2.6 mongoc.c
--- rpm/rpmio/mongoc.c 11 May 2015 21:10:18 -0000 1.1.2.5
+++ rpm/rpmio/mongoc.c 9 Mar 2016 21:27:27 -0000 1.1.2.6
@@ -39,8 +39,10 @@
# include <winerror.h>
#endif
+#ifdef HAVE_LIBSASL2
#include <sasl/sasl.h>
#include <sasl/saslutil.h>
+#endif
#include <openssl/bio.h>
#include <openssl/ssl.h>
@@ -14228,6 +14230,7 @@
return ret;
}
+#ifdef MONGOC_ENABLE_SASL
/*==============================================================*/
/* --- mongoc-sasl.c */
@@ -14555,6 +14558,7 @@
return true;
}
+#endif
/*==============================================================*/
/* --- mongoc-socket.c */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
