diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-08-15 14:00:13 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-28 17:54:21 -0700 |
| commit | 01ca663883fa404ef1816721f84c8c05e1845b64 (patch) | |
| tree | 1847b3493657250bf897fcf4ac216dfcc1d6bbaa | |
| parent | dbb3484f27582a489c35a9e977f8be647ed2d10a (diff) | |
| download | ceph-01ca663883fa404ef1816721f84c8c05e1845b64.tar.gz | |
rgw: always use system libs3 (when needed)
Already removed the libs3 submodule, so always refer to the
system libs3. We only need it for rest-bench anyway.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | src/Makefile.am | 26 |
2 files changed, 4 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 38b6782a46a..70505730df4 100644 --- a/configure.ac +++ b/configure.ac @@ -452,17 +452,6 @@ AC_LANG_PUSH([C++]) AC_CHECK_HEADER([leveldb/filter_policy.h], [AC_DEFINE([HAVE_LEVELDB_FILTER_POLICY], [1], [Defined if LevelDB supports bloom filters ])]) AC_LANG_POP([C++]) -# 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" ]) - # rest-bench? AC_ARG_WITH([rest-bench], [AS_HELP_STRING([--with-rest-bench], [enables rest-bench])], @@ -470,6 +459,9 @@ AC_ARG_WITH([rest-bench], [with_rest_bench=no]) AM_CONDITIONAL(WITH_REST_BENCH, [ test "$with_rest_bench" = "yes" ]) +AS_IF([test "x$with_rest_bench" != xno], + [AC_CHECK_LIB([s3], [S3_initialize], [true], AC_MSG_FAILURE([libs3 not found]))]) + # use libaio? AC_ARG_WITH([libaio], [AS_HELP_STRING([--without-libaio], [disable libaio use by journal])], diff --git a/src/Makefile.am b/src/Makefile.am index 4b09c23e872..e06e6b6eacc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,25 +1,8 @@ AUTOMAKE_OPTIONS = gnu SUBDIRS = ocf java -DIST_SUBDIRS = gtest ocf libs3 java +DIST_SUBDIRS = gtest ocf java 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 \ yasm-wrapper @@ -488,14 +471,7 @@ rest_bench_SOURCES = tools/rest_bench.cc common/obj_bencher.cc rest_bench_LDADD = $(LIBGLOBAL_LDA) rest_bench_CXXFLAGS = ${AM_CXXFLAGS} bin_PROGRAMS += rest-bench - -if WITH_SYSTEM_LIBS3 rest_bench_LDADD += -ls3 -else -rest_bench_LDADD += libs3/build/lib/libs3.a -lcurl -lxml2 -rest_bench_CXXFLAGS += -I$(top_srcdir)/src/libs3/inc -SUBDIRS += libs3 -endif endif |