[svn:dbd-oracle] r14929 - dbd-oracle/trunk

Author: mjevans
Date: Wed Sep  7 06:41:04 2011
New Revision: 14929

Modified:
   dbd-oracle/trunk/Changes
   dbd-oracle/trunk/Makefile.PL

Log:
Apply patch from Tux for symbolic ORACLE_HOME


Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes	(original)
+++ dbd-oracle/trunk/Changes	Wed Sep  7 06:41:04 2011
@@ -7,10 +7,11 @@
  [BUG FIXES]
  - support development release versions in GetInfo (Martin J. Evans)
  - don't gag diag() on the tests by default
+ - convert a symbolically linked ORACLE_HOME to an absolute path (patch by H.Merijn Brand, applied by Martin J. Evans) [rt70785]
 
 Changes in DBD-Oracle 1.30
   [DOCUMENTATION]
- - add warning about RT#69350 in documentation 
+ - add warning about RT#69350 in documentation
 
 Changes in DBD-Oracle 1.29_1
  [ENHANCEMENTS]
@@ -26,7 +27,7 @@
 
  [BUG FIXES]
  - fixed bug in bind_col which was broken in 1.27 and stopped anyone using
-    a string as a column number. E.g., '1' (Martin J. Evans, Alexander
+    a string as a column number. e.g., '1' (Martin J. Evans, Alexander
     Foken)
  - removed obsolete oparse_lang (John Scoles)
  - fixed some compiler warnings in dbdimp.c and oci8.c (Martin J. Evans)

Modified: dbd-oracle/trunk/Makefile.PL
==============================================================================
--- dbd-oracle/trunk/Makefile.PL	(original)
+++ dbd-oracle/trunk/Makefile.PL	Wed Sep  7 06:41:04 2011
@@ -219,7 +219,7 @@
 
 my $ORACLE_ENV  = ($^O eq 'VMS') ? 'ORA_ROOT' : 'ORACLE_HOME';
 my $OH = $ENV{$ORACLE_ENV} || '';
-$OH  = win32_oracle_home($OH) if ($^O eq 'MSWin32') or ($^O =~ /cygwin/i);
+$OH = win32_oracle_home($OH) if ($^O eq 'MSWin32') or ($^O =~ /cygwin/i);
 $OH = unixify $OH if $^O eq 'VMS';
 $OH =~ s:/$::;
 
@@ -237,7 +237,7 @@
   print "WARNING: If these tests fail you may have to set ORACLE_HOME yourself!\n";
   sleep 5;
 }
-
+-l $OH and $OH = Cwd::abs_path ($OH); # Oracle really dislikes symbolic links
 die qq{  The $ORACLE_ENV environment variable value ($OH) is not valid.
   It must be set to hold the path to an Oracle installation directory
   on this machine (or a machine with a compatible architecture).