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

ceph-rest-api: drop autotools detection

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

diff --git a/src/ceph-rest-api b/src/ceph-rest-api
index 772b3d20fcd6..1405ab5bbae5 100755
--- a/src/ceph-rest-api
+++ b/src/ceph-rest-api
@@ -12,22 +12,6 @@ MYPATH = os.path.abspath(__file__)
 MYDIR = os.path.dirname(MYPATH)
 DEVMODEMSG = '*** DEVELOPER MODE: setting PYTHONPATH and LD_LIBRARY_PATH'
 
-if MYDIR.endswith('src') and \
-   os.path.exists(os.path.join(MYDIR, '.libs')) and \
-   os.path.exists(os.path.join(MYDIR, 'pybind')):
-    MYLIBPATH = os.path.join(MYDIR, '.libs')
-    if 'LD_LIBRARY_PATH' in os.environ:
-        if MYLIBPATH not in os.environ['LD_LIBRARY_PATH']:
-            os.environ['LD_LIBRARY_PATH'] += ':' + MYLIBPATH
-            print >> sys.stderr, DEVMODEMSG
-            os.execvp('python', ['python'] + sys.argv)
-    else:
-        os.environ['LD_LIBRARY_PATH'] = MYLIBPATH
-        print >> sys.stderr, DEVMODEMSG
-        os.execvp('python', ['python'] + sys.argv)
-    sys.path.insert(0, os.path.join(MYDIR, 'pybind'))
-
-
 def parse_args():
     parser = argparse.ArgumentParser(description="Ceph REST API webapp")
     parser.add_argument('-c', '--conf', help='Ceph configuration file')