r47728 - /trunk/libdbd-sqlite3-perl/Makefile.PL

[ryan at users.alioth.debian.org]

Author: ryan
Date: Tue Nov 24 15:06:33 2009
New Revision: 47728

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47728
Log:
oops, committed

Modified:
    trunk/libdbd-sqlite3-perl/Makefile.PL

Modified: trunk/libdbd-sqlite3-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/Makefile.PL?rev=47728&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/Makefile.PL (original)
+++ trunk/libdbd-sqlite3-perl/Makefile.PL Tue Nov 24 15:06:33 2009
@@ -123,7 +123,7 @@
 # a system sqlite is also sophisticated enough to have a patching system
 # that can change the if ( 0 ) to if ( 1 )
 my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-if ( 1 ) {
+if ( 0 ) {
 	require File::Spec;
 	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
 		$sqlite_base =~ /=(.*)/;
@@ -172,7 +172,11 @@
 			}
 		}
 		unless ( $version && ($version >= 3006000) ) {
-                  die "SQLite version must be at least 3.6.0. No header file at that\nversion or higher was found. Using the local version instead.\n";
+			warn "SQLite version must be at least 3.6.0. No header file at that\n";
+			warn "version or higher was found. Using the local version instead.\n";
+			$sqlite_local = 1;
+			undef $sqlite_lib;
+			undef $sqlite_inc;
 		} else {
 			print "Looks good\n" if $ENV{AUTOMATED_TESTING};
 		}