From: Daniel Gryniewicz <dang@redhat.com>
Date: Fri, 10 Jun 2016 15:33:56 +0000 (-0400)
Subject: Allow building RGW with LDAP disabled
X-Git-Tag: v10.2.4~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=86eef272304f3896a9cda5cde7e882d09d0269c0;p=ceph.git

Allow building RGW with LDAP disabled

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit 38abfcb5d036c050a363533a2c7b658d528d3612)
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 103e68a14c60..35a890fbe437 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1101,10 +1101,6 @@ endif(${WITH_KVS})
 
 if(${WITH_RADOSGW})
 
-  if(${HAVE_OPENLDAP})
-    set(rgw_ldap_srcs rgw/rgw_ldap.cc)
-  endif(${HAVE_OPENLDAP})
-
   set(rgw_a_srcs
     rgw/rgw_acl.cc
     rgw/rgw_acl_s3.cc
@@ -1126,7 +1122,7 @@ if(${WITH_RADOSGW})
     rgw/rgw_http_client.cc
     rgw/rgw_json_enc.cc
     rgw/rgw_keystone.cc
-    ${rgw_ldap_srcs}
+    rgw/rgw_ldap.cc
     rgw/rgw_loadgen.cc
     rgw/rgw_log.cc
     rgw/rgw_metadata.cc