mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 22:53:42 +00:00
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
diff -rc DBD-SQLite-1.29/Makefile.PL DBD-SQLite-1.29-new/Makefile.PL
|
|
*** DBD-SQLite-1.29/Makefile.PL 2010-01-08 10:08:29.000000000 +0100
|
|
--- DBD-SQLite-1.29-new/Makefile.PL 2010-08-05 11:42:53.000000000 +0200
|
|
***************
|
|
*** 123,129 ****
|
|
# 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 ( 0 ) {
|
|
require File::Spec;
|
|
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
|
|
$sqlite_base =~ /=(.*)/;
|
|
--- 123,129 ----
|
|
# 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 ) {
|
|
require File::Spec;
|
|
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
|
|
$sqlite_base =~ /=(.*)/;
|
|
***************
|
|
*** 184,191 ****
|
|
} else {
|
|
# Always the bundled one.
|
|
# XXX: ... and this message should be more informative.
|
|
! $sqlite_local = 1;
|
|
! print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
|
|
}
|
|
|
|
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
|
|
--- 184,191 ----
|
|
} else {
|
|
# Always the bundled one.
|
|
# XXX: ... and this message should be more informative.
|
|
! # $sqlite_local = 1;
|
|
! # print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
|
|
}
|
|
|
|
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
|