remove libs3 submodule

Signed-off-by: Sage Weil <[email protected]>

.gitmodule_mirrors

@@ -2,7 +2,6 @@
 # Only used by autobuild-ceph.
 ceph-object-corpus git://apt-mirror.front.sepia.ceph.com/ceph-object-corpus.git
 src/civetweb git://apt-mirror.front.sepia.ceph.com/civetweb.git
-src/libs3 git://apt-mirror.front.sepia.ceph.com/libs3.git
 src/mongoose git://apt-mirror.front.sepia.ceph.com/mongoose.git
 src/leveldb git://apt-mirror.front.sepia.ceph.com/leveldb.git
 src/erasure-code/jerasure/jerasure git://apt-mirror.front.sepia.ceph.com/jerasure.git

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "ceph-object-corpus"]
 	path = ceph-object-corpus
 	url = https://github.com/ceph/ceph-object-corpus.git
-[submodule "src/libs3"]
-	path = src/libs3
-	url = https://github.com/ceph/libs3.git
 [submodule "src/civetweb"]
 	path = src/civetweb
 	url = https://github.com/ceph/civetweb

configure.ac

@@ -813,17 +813,6 @@ if test "x$with_jemalloc" = "xyes"; then
 	fi
 fi
 
-# use system libs3?
-AC_ARG_WITH([system-libs3],
-	[AS_HELP_STRING([--with-system-libs3], [use system libs3])],
-	,
-	[with_system_libs3=no])
-AS_IF([test "x$with_system_libs3" = xyes],
-            [AC_CHECK_LIB([s3], [S3_initialize], [true], [AC_MSG_FAILURE([libs3 not found])], [-lpthread])])
-AS_IF([test "x$with_system_libs3" = xcheck],
-            [AC_SEARCH_LIBS([S3_initialize], [s3], [with_system_libs3=yes], [true], [-lpthread])])
-AM_CONDITIONAL(WITH_SYSTEM_LIBS3, [ test "$with_system_libs3" = "yes" ])
-
 # needs libcurl and libxml2
 if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then
    AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))

src/Makefile.am

@@ -1,7 +1,7 @@
 include Makefile-env.am
 
 SUBDIRS += ocf java tracing
-DIST_SUBDIRS += gmock ocf libs3 java tracing
+DIST_SUBDIRS += gmock ocf java tracing
 
 if NO_GIT_VERSION
 export NO_VERSION="yes"
@@ -109,23 +109,6 @@ EXTRA_DIST += \
 	yasm-wrapper
 
 EXTRA_DIST += \
-	libs3/COPYING \
-	libs3/ChangeLog \
-	libs3/GNUmakefile \
-	libs3/GNUmakefile.mingw \
-	libs3/GNUmakefile.osx \
-	libs3/INSTALL \
-	libs3/LICENSE \
-	libs3/README \
-	libs3/TODO \
-	libs3/archlinux \
-	libs3/debian \
-	libs3/doxyfile \
-	libs3/inc \
-	libs3/libs3.spec \
-	libs3/mswin \
-	libs3/src \
-	libs3/test \
 	unittest_bufferlist.sh
 
 

src/script/dep-report.sh

@@ -111,9 +111,6 @@ do
 done
 
 echo -e "\nSource Code Dependencies:\n"
-echo "src/libs3"
-echo "    Name:    libs3"
-echo "    License: GPLv3"
 echo "src/leveldb"
 echo "    Name:    leveldb"
 echo "    License: Google Public License"