]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Allow building RGW with LDAP disabled 11478/head
authorDaniel Gryniewicz <dang@redhat.com>
Fri, 10 Jun 2016 15:33:56 +0000 (11:33 -0400)
committerLoic Dachary <ldachary@redhat.com>
Thu, 13 Oct 2016 10:31:08 +0000 (12:31 +0200)
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit 38abfcb5d036c050a363533a2c7b658d528d3612)

src/CMakeLists.txt

index 103e68a14c60ee19205426812cc757d952981b43..35a890fbe4372fe97991390be576848dc4de3eae 100644 (file)
@@ -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