Merge branch 'homebrew' of http://github.com/siuying/PyBitmessage into siuying-homebrew

This commit is contained in:
Jonathan Warren 2013-05-14 11:54:45 -04:00
commit 78f1213a04

View File

@ -415,17 +415,21 @@ except:
OpenSSL = _OpenSSL('libcrypto.dylib') OpenSSL = _OpenSSL('libcrypto.dylib')
except: except:
try: try:
from os import path # try homebrew installation
lib_path = path.join(sys._MEIPASS, "libeay32.dll") OpenSSL = _OpenSSL('/usr/local/opt/openssl/lib/libcrypto.dylib')
OpenSSL = _OpenSSL(lib_path)
except: except:
if 'linux' in sys.platform or 'darwin' in sys.platform: try:
try: from os import path
from ctypes.util import find_library lib_path = path.join(sys._MEIPASS, "libeay32.dll")
OpenSSL = _OpenSSL(find_library('ssl')) OpenSSL = _OpenSSL(lib_path)
except Exception, err: except:
sys.stderr.write('(On Linux) Couldn\'t find and load the OpenSSL library. You must install it. If you believe that you already have it installed, this exception information might be of use:\n') if 'linux' in sys.platform or 'darwin' in sys.platform:
from ctypes.util import find_library try:
OpenSSL = _OpenSSL(find_library('ssl')) from ctypes.util import find_library
else: OpenSSL = _OpenSSL(find_library('ssl'))
raise Exception("Couldn't find and load the OpenSSL library. You must install it.") except Exception, err:
sys.stderr.write('(On Linux) Couldn\'t find and load the OpenSSL library. You must install it. If you believe that you already have it installed, this exception information might be of use:\n')
from ctypes.util import find_library
OpenSSL = _OpenSSL(find_library('ssl'))
else:
raise Exception("Couldn't find and load the OpenSSL library. You must install it.")