RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 23:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: use autoconf $libdir for default rados class dir

Browse Source 
Fixes: #1722
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-12-30 09:50:36 -08:00
parent 0d9507c2b0
commit 85719b0ed8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile.am
View File

@ -733,8 +733,11 @@ ${WARN_TYPE_LIMITS} ${WARN_IGNORED_QUALIFIERS} -Winit-self -Wpointer-arith \
-fno-strict-aliasing
AM_CFLAGS = $(AM_COMMON_FLAGS)
AM_CXXFLAGS = $(AM_COMMON_FLAGS) -Wnon-virtual-dtor -Wno-invalid-offsetof \
-Wstrict-null-sentinel
AM_CXXFLAGS = $(AM_COMMON_FLAGS) \
-DCEPH_LIBDIR=\"${libdir}\" \
-Wnon-virtual-dtor \
-Wno-invalid-offsetof \
-Wstrict-null-sentinel
AM_LDFLAGS = -Wl,--as-needed
if USE_BOOST_SPIRIT_OLD_HDR

2
src/common/config_opts.h
View File

@ -283,7 +283,7 @@ OPTION(osd_scrub_max_interval, OPT_FLOAT, 60*60*24) // once a day
OPTION(osd_auto_weight, OPT_BOOL, false)
OPTION(osd_class_error_timeout, OPT_DOUBLE, 60.0) // seconds
OPTION(osd_class_timeout, OPT_DOUBLE, 60*60.0) // seconds
OPTION(osd_class_dir, OPT_STR, "/usr/lib/rados-classes")
OPTION(osd_class_dir, OPT_STR, CEPH_LIBDIR "/rados-classes")
OPTION(osd_check_for_log_corruption, OPT_BOOL, false)
OPTION(osd_use_stale_snap, OPT_BOOL, false)
OPTION(osd_rollback_to_cluster_snap, OPT_STR, "")