simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-08 06:38:12 -04:00
Code Issues Releases Wiki Activity

Add additional comments for downstream packagers, giving them permission to link to a local SQLite, but only if they apply a one line patch.

Browse source
This commit is contained in:
Adam Kennedy 2009-07-21 12:36:08 +00:00
parent 8713237138
commit 03603aa7b3
1 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Makefile.PL
View file

@ -58,8 +58,6 @@ if ( $@ or DBI->VERSION < $DBI_required ) {
exit(0); exit(0);
} }
# 2005/6/19, by rjray@blackperl.com
#
# Determine if we are going to use the provided SQLite code, or an already- # Determine if we are going to use the provided SQLite code, or an already-
# installed copy. To this end, look for two command-line parameters: # installed copy. To this end, look for two command-line parameters:
# #
@ -68,17 +66,13 @@ if ( $@ or DBI->VERSION < $DBI_required ) {
# #
# In absense of either of those, expect SQLite 3.X.X libs and headers in the # In absense of either of those, expect SQLite 3.X.X libs and headers in the
# common places known to Perl or the C compiler. # common places known to Perl or the C compiler.
#
# 2009/04/02 # Note to Downstream Packagers:
# But why do we need to use an older, system-installed library? # This block is if ( 0 ) to discourage casual users building against
# Let's always use the bundled one. -- ISHIGAKI # the system SQLite. We expect that anyone sophisticated enough to use
# 2009/04/03 # a system sqlite is also sophisticated enough to have a patching system
# For the moment, while we're fixing things, this is reasonable. # that can change the if ( 0 ) to if ( 1 )
# However, logic in the form "I lack knowledge, thereforce lets do my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
# it this way" is not a sufficiently robust decision making process.
# Let's find out the full story first, so we can make an informed
# decision to whether to do this. -- ADAMK
my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
if ( 0 ) { if ( 0 ) {
require File::Spec; require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
@ -87,10 +81,10 @@ if ( 0 ) {
$sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib' ); $sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib' );
$sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' ); $sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' );
} }
if ( $force_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) { if ( $sqlite_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) {
$force_local =~ /=(.*)/; $sqlite_local =~ /=(.*)/;
$force_local = "$1" ? 1 : 0; $sqlite_local = "$1" ? 1 : 0;
if ( $force_local ) { if ( $sqlite_local ) {
# Keep these from making into CFLAGS/LDFLAGS # Keep these from making into CFLAGS/LDFLAGS
undef $sqlite_lib; undef $sqlite_lib;
undef $sqlite_inc; undef $sqlite_inc;
@ -98,7 +92,7 @@ if ( 0 ) {
} }
# Now check for a compatible sqlite3 # Now check for a compatible sqlite3
unless ( $force_local ) { unless ( $sqlite_local ) {
my ($dir, $file, $fh, $version); my ($dir, $file, $fh, $version);
print "Checking installed SQLite version...\n" if $ENV{AUTOMATED_TESTING}; print "Checking installed SQLite version...\n" if $ENV{AUTOMATED_TESTING};
if ( $sqlite_inc ) { if ( $sqlite_inc ) {
@ -130,20 +124,20 @@ if ( 0 ) {
unless ( $version && ($version >= 3006000) ) { unless ( $version && ($version >= 3006000) ) {
warn "SQLite version must be at least 3.6.0. No header file at that\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"; warn "version or higher was found. Using the local version instead.\n";
$force_local = 1; $sqlite_local = 1;
undef $sqlite_lib; undef $sqlite_lib;
undef $sqlite_inc; undef $sqlite_inc;
} else { } else {
print "Looks good\n" if $ENV{AUTOMATED_TESTING}; print "Looks good\n" if $ENV{AUTOMATED_TESTING};
} }
} }
} 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};
} }
# Use always the bundled one.
# XXX: ... and this message should be more informative.
$force_local = 1;
print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
@ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV ); @ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
@ -157,7 +151,7 @@ my @CC_LIBS = ();
if ( $sqlite_lib ) { if ( $sqlite_lib ) {
push @CC_LIBS, "-L$sqlite_lib"; push @CC_LIBS, "-L$sqlite_lib";
} }
unless ( $force_local ) { unless ( $sqlite_local ) {
push @CC_LIBS, '-lsqlite3'; push @CC_LIBS, '-lsqlite3';
} }
@ -249,7 +243,7 @@ WriteMakefile(
} }
}, },
), ),
OBJECT => ( $force_local OBJECT => ( $sqlite_local
? '$(O_FILES)' ? '$(O_FILES)'
: 'SQLite.o dbdimp.o' : 'SQLite.o dbdimp.o'
), ),