[mapserver-commits] r8653 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2009-03-07 14:25:21 -0500 (Sat, 07 Mar 2009)
New Revision: 8653

Modified:
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Properly detect .dylib files for Oracle on Mac (#2920)

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2009-03-07 19:24:51 UTC (rev 8652)
+++ trunk/mapserver/configure	2009-03-07 19:25:21 UTC (rev 8653)
@@ -11577,9 +11577,10 @@
   ORACLESPATIAL_LIB=
 else
 
-    test -f $ORA_HOME/lib/libclntsh.so && ORA_LIBDIR="$ORA_HOME/lib"
-  test -f $ORA_HOME/libclntsh.so &&     ORA_LIBDIR="$ORA_HOME"
+    test -f $ORA_HOME/lib/libclntsh.so -o -f $ORA_HOME/lib/libclntsh.dylib && ORA_LIBDIR="$ORA_HOME/lib"
+  test -f $ORA_HOME/libclntsh.so -o -f $ORA_HOME/libclntsh.dylib && ORA_LIBDIR="$ORA_HOME"
   test -f $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.so && ORA_LIBDIR=`dirname $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.so`
+  test -f $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.dylib && ORA_LIBDIR=`dirname $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.dylib`
 
   if test -z "$ORA_LIBDIR" ; then
     { { echo "$as_me:$LINENO: error: Oracle Spatial: libclntsh.so not found." >&5

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2009-03-07 19:24:51 UTC (rev 8652)
+++ trunk/mapserver/configure.in	2009-03-07 19:25:21 UTC (rev 8653)
@@ -1563,9 +1563,10 @@
 else
 
   dnl Try to locate lib directory
-  test -f $ORA_HOME/lib/libclntsh.so && ORA_LIBDIR="$ORA_HOME/lib"
-  test -f $ORA_HOME/libclntsh.so &&     ORA_LIBDIR="$ORA_HOME"
+  test -f $ORA_HOME/lib/libclntsh.so -o -f $ORA_HOME/lib/libclntsh.dylib && ORA_LIBDIR="$ORA_HOME/lib"
+  test -f $ORA_HOME/libclntsh.so -o -f $ORA_HOME/libclntsh.dylib && ORA_LIBDIR="$ORA_HOME"
   test -f $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.so && ORA_LIBDIR=`dirname $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.so`
+  test -f $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.dylib && ORA_LIBDIR=`dirname $ORA_HOME/lib/oracle/10*/client/lib/libclntsh.dylib`
 
   if test -z "$ORA_LIBDIR" ; then
     AC_MSG_ERROR([Oracle Spatial: libclntsh.so not found.])