Fix dynamic engine loading

Load dynamic engines included in OpenSSL using load_dynamic(), so no
path information is needed.  This simplifies build, installation, and
run-time complexity and accuracy because the path of the OpenSSL library
doesn't need to be identified.

1 files changed, 0 insertions, 17 deletions

diff --git a/setup.py b/setup.py
index 3727dfe..52afe0d 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,6 @@ JQUERY_UI_PATH = "'http://code.jquery.com/ui/1.11.4/jquery-ui.min.js'"
 JQUERY_UI_CSS_PATH = "'http://code.jquery.com/ui/1.11.4/themes/redmond/jquery-ui.css'"
 JQUERY_PATH = "'http://code.jquery.com/jquery-1.11.3.min.js'"
 RAPHAEL_PATH = "'http://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.4/raphael-min.js'"
-OPENSSL_LIB_DIR = "None"
 
 def apply_substitutions(filename, install_prefix):
     assert filename.endswith('.in'), 'Filename supplied for customization must end with \'.in\': %s' % (filename)
@@ -33,7 +32,6 @@ def apply_substitutions(filename, install_prefix):
     s = s.replace('__JQUERY_UI_PATH__', JQUERY_UI_PATH)
     s = s.replace('__JQUERY_UI_CSS_PATH__', JQUERY_UI_CSS_PATH)
     s = s.replace('__RAPHAEL_PATH__', RAPHAEL_PATH)
-    s = s.replace('__OPENSSL_LIB_DIR__', OPENSSL_LIB_DIR)
     out_fh.write(s)
     in_fh.close()
     out_fh.close()
@@ -46,20 +44,6 @@ def make_documentation():
     finally:
         os.chdir('..')
 
-def set_openssl_lib_path():
-    global OPENSSL_LIB_DIR
-
-    msg = ''
-    try:
-        libdir = subprocess.Popen(['pkg-config', '--variable=libdir', 'openssl'], stdout=subprocess.PIPE).communicate()[0].strip()
-    except (subprocess.CalledProcessError, OSError), e:
-        libdir = None
-        msg = str(e)
-    if not libdir or not os.path.exists(libdir):
-        sys.stderr.write('Warning: Unable to identify the lib directory for openssl: %s\nProceeding without support for dynamically loaded engines.\n' % msg)
-    else:
-        OPENSSL_LIB_DIR = "'%s'" % libdir
-
 class MyBuild(build):
     def run(self):
         make_documentation()
@@ -67,7 +51,6 @@ class MyBuild(build):
 
 class MyInstall(install):
     def run(self):
-        set_openssl_lib_path()
         # if this an alternate root is specified, then embed the install_data
         # path relative to that alternate root
         if self.root is not None: