]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph: remove autotools detection
authorSage Weil <sage@redhat.com>
Mon, 26 Sep 2016 19:26:34 +0000 (15:26 -0400)
committerSage Weil <sage@redhat.com>
Mon, 26 Sep 2016 19:50:30 +0000 (15:50 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/ceph.in

index a6ba4e6bbd2e6e0b51f5df0203623dc28512d9f7..5ea0876d7f07e2f851d87fb0d3589b9e8ccca269 100755 (executable)
@@ -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"):