RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-18 05:15:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix installation into user home directory, broken by d3f0c0b"

Browse Source 
This reverts commit 7539281037.

This breaks mount.fuse.ceph installation.
This commit is contained in:
Sage Weil 2014-05-06 07:04:56 -07:00
parent cdbbf86fa3
commit e65a9da93a
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -325,7 +325,7 @@ AM_CONDITIONAL(WITH_RADOSGW, test "$RADOSGW" = "1")
AS_IF([test "$RADOSGW" = "1"], [AC_DEFINE([WITH_RADOSGW], [1], [define if radosgw enabled])])
AS_IF([test "$RADOSGW" = "1"],
AS_IF([test "$RADOSGW" = "1"],
[AC_CHECK_LIB([curl], [curl_multi_wait],
AC_DEFINE([HAVE_CURL_MULTI_WAIT], [1], [Define if have curl_multi_wait()]))
])
@ -416,7 +416,7 @@ if test "x$enable_cephfs_java" = "xyes"; then
])
# cephfs_java_test only makes sense if java is already turned on
# setup CLASSPATH for Debian default junit4.jar package
# setup CLASSPATH for Debian default junit4.jar package
#
# Configuring --with-debug and --enable-cephfs-java will throw an error if
# JUnit4 cannot be found. While currently this works for users who have
@ -538,7 +538,7 @@ AC_ARG_WITH([libaio],
AS_IF([test "x$with_libaio" != xno],
[AC_CHECK_LIB([aio], [io_submit], [true], AC_MSG_FAILURE([libaio not found]))])
AS_IF([test "x$with_libaio" != xno],
[AC_CHECK_HEADER([libaio.h])])
[AC_CHECK_HEADER([libaio.h])])
AS_IF([test "$with_libaio" = "yes"],
[AC_DEFINE([HAVE_LIBAIO], [1], [Defined if you don't have atomic_ops])])
AM_CONDITIONAL(WITH_LIBAIO, [ test "$with_libaio" = "yes" ])
@ -785,7 +785,6 @@ AC_FUNC_STRERROR_R
AC_LANG_POP([C++])
AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
AM_CONDITIONAL(USR_EXEC_PREFIX, test $exec_prefix -eq /usr)
AM_PATH_PYTHON([2.4],
[], [AC_MSG_FAILURE([Failed to find Python 2.4 or newer])])

13
src/Makefile-env.am
View File

@ -15,8 +15,8 @@ sbin_SCRIPTS =
su_sbin_PROGRAMS =
su_sbin_SCRIPTS =
dist_bin_SCRIPTS =
lib_LTLIBRARIES =
noinst_LTLIBRARIES =
lib_LTLIBRARIES =
noinst_LTLIBRARIES =
noinst_LIBRARIES =
radoslib_LTLIBRARIES =
@ -26,12 +26,8 @@ bin_DEBUGPROGRAMS =
# like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
ceph_sbindir = $(sbindir)
# certain things go straight into /sbin if installed under /usr, though!
if USR_EXEC_PREFIX
su_sbindir = /sbin
else
su_sbindir = $(exec_prefix)/sbin
endif
# certain things go straight into /sbin, though!
su_sbindir = /sbin
# C/C++ tests to build will be appended to this
check_PROGRAMS =
@ -198,3 +194,4 @@ DENCODER_DEPS =
radoslibdir = $(libdir)/rados-classes