From: Sage Weil <sage@redhat.com>
Date: Mon, 26 Sep 2016 19:26:34 +0000 (-0400)
Subject: ceph: remove autotools detection
X-Git-Tag: v11.0.1~89^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=404f476ed00f1d95c73a2762037aa025d8ead39e;p=ceph.git

ceph: remove autotools detection

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index a6ba4e6bbd2e..5ea0876d7f07 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -70,17 +70,7 @@ def get_pythonlib_dir():
     """Returns the name of a distutils build directory"""
     return "lib.{version[0]}".format(version=sys.version_info)
 
-if MYDIR.endswith('src') and \
-   os.path.exists(os.path.join(MYDIR, '.libs')) and \
-   os.path.exists(os.path.join(MYDIR, 'pybind')) and \
-   os.path.exists(os.path.join(MYDIR, 'build')):
-
-    python_libpath = os.path.join(MYDIR, 'build', get_pythonlib_dir())
-    respawn_in_path(os.path.join(MYDIR, '.libs'), 'pybind', python_libpath)
-    if 'PATH' in os.environ and MYDIR not in os.environ['PATH']:
-        os.environ['PATH'] += ':' + MYDIR
-
-elif os.path.exists(os.path.join(os.getcwd(), "CMakeCache.txt")) \
+if os.path.exists(os.path.join(os.getcwd(), "CMakeCache.txt")) \
      and os.path.exists(os.path.join(os.getcwd(), "bin/init-ceph")):
     src_path = None
     for l in open("./CMakeCache.txt"):