aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2010-12-11 19:47:32 -0500
committerMike Crute <mcrute@gmail.com>2010-12-11 19:47:32 -0500
commit113a58cefa67137cd14872c7517154229c86752c (patch)
tree29ef9c6d68aba62b5d65ace3f4c5c282aef19f83
parent88ad64b2ff37b4693f6823a9b553500db5fad9da (diff)
downloaddodai-macsupport-master.tar.bz2
dodai-macsupport-master.tar.xz
dodai-macsupport-master.zip
Fixing library search on Mac OSHEADmaster
-rw-r--r--setup.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 7cae721..433e1a0 100644
--- a/setup.py
+++ b/setup.py
@@ -21,8 +21,14 @@ import sys
21import platform 21import platform
22from setuptools import setup 22from setuptools import setup
23from setuptools import find_packages 23from setuptools import find_packages
24from ctypes.util import find_library 24
25from ctypes.util import _findLib_ldconfig as find_library_ldconfig 25try:
26 # This is probably Linux
27 from ctypes.util import _findLib_ldconfig as find_library
28except ImportError:
29 # This is something else (maybe Mac OS X?)
30 from ctypes.util import find_library
31
26from subprocess import Popen, PIPE 32from subprocess import Popen, PIPE
27from copy import deepcopy 33from copy import deepcopy
28 34
@@ -136,7 +142,7 @@ class OracleLibCheck(BaseLibCheck):
136 return False 142 return False
137 143
138 def _set_oracle_home(self): 144 def _set_oracle_home(self):
139 path = find_library_ldconfig(self.LIB) 145 path = find_library(self.LIB)
140 os.environ['ORACLE_HOME'] = os.path.dirname(path) 146 os.environ['ORACLE_HOME'] = os.path.dirname(path)
141 147
142 148