[Zope-Checkins] CVS: Products/DCOracle2/src - testora:1.9

[Matthew T. Kromer]

Update of /cvs-repository/Products/DCOracle2/src
In directory cvs.zope.org:/tmp/cvs-serv20479/src

Modified Files:
	testora 
Log Message:
Added a patch from Wilfredo Sanchez (hand merged, so any typos are mine,
not his!) to handle the fact that MacOS X uses .dylib rather than .so as
an extension.


=== Products/DCOracle2/src/testora 1.8 => 1.9 ===
--- Products/DCOracle2/src/testora:1.8	Fri Sep 27 14:01:43 2002
+++ Products/DCOracle2/src/testora	Fri Sep 12 12:45:41 2003
@@ -17,7 +17,12 @@
 
 echo -n "Checking for Oracle version..."
 
-if [ ! -r "$ORACLE_HOME/lib/libclntsh.so" ]; then
+# Thanks to Wilfredo Sanchez for the MacOS X patch
+if [ -r "$ORACLE_HOME/lib/libclntsh.so" ]; then
+	LIBCLNTSH=libclntsh.so
+elif [ -r "$ORACLE_HOME/lib/libclntsh.dylib" ]; then
+	LIBCLNTSH=libclntsh.dylib
+else
 	echo "failed."
 	echo "$ORACLE_HOME/lib/libclntsh.so not readable; unable to"
 	echo "determine your oracle version."
@@ -27,14 +32,14 @@
 #
 # Check for the symbol OCIEnvCreate in libclntsh.so, indicating Oracle 8i
 #
-nm $ORACLE_HOME/lib/libclntsh.so | grep OCIConnectionPoolCreate > /dev/null
+nm $ORACLE_HOME/lib/$LIBCLNTSH | grep OCIConnectionPoolCreate > /dev/null
 
 if [ "$?" = "0" ]; then
 	ORADEF="-DORACLE9i" 
 	ORAINCLUDES=""
 	echo "Oracle 9i found."
 else
-	nm $ORACLE_HOME/lib/libclntsh.so | grep OCIEnvCreate > /dev/null
+	nm $ORACLE_HOME/lib/$LIBCLNTSH.so | grep OCIEnvCreate > /dev/null
  	if [ "$?" = "0" ]; then
 		ORADEF="-DORACLE8i" 
 		ORAINCLUDES=""