|
@@ -1,6 +1,6 @@
|
|
|
Index: Makefile.PL
|
|
Index: Makefile.PL
|
|
|
---- Makefile.PL.orig 2004-10-12 11:03:50 +0200
|
|
|
|
|
-+++ Makefile.PL 2004-10-13 19:23:27 +0200
|
|
|
|
|
|
|
+--- Makefile.PL.orig 2005-06-20 14:45:11 +0200
|
|
|
|
|
++++ Makefile.PL 2005-06-21 21:02:43 +0200
|
|
|
@@ -7,34 +7,6 @@
|
|
@@ -7,34 +7,6 @@
|
|
|
use ExtUtils::MakeMaker;
|
|
use ExtUtils::MakeMaker;
|
|
|
use Config;
|
|
use Config;
|
|
@@ -34,22 +34,22 @@ Index: Makefile.PL
|
|
|
- }
|
|
- }
|
|
|
-};
|
|
-};
|
|
|
|
|
|
|
|
- my $nlid = $DBI::VERSION > 1.42 ? '' : '-Dno_last_insert_id';
|
|
|
|
|
-
|
|
|
|
|
-@@ -43,8 +15,9 @@
|
|
|
|
|
|
|
+ # 2005/6/19, by rjray@blackperl.com
|
|
|
|
|
+ #
|
|
|
|
|
+@@ -113,8 +85,9 @@
|
|
|
'VERSION_FROM' => 'lib/DBD/SQLite.pm', # finds $VERSION
|
|
'VERSION_FROM' => 'lib/DBD/SQLite.pm', # finds $VERSION
|
|
|
'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1
|
|
'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1
|
|
|
- 'OBJECT' => '$(O_FILES)',
|
|
|
|
|
-- 'INC' => '-I. -I$(DBI_INSTARCH_DIR)',
|
|
|
|
|
- 'OPTIMIZE' => "-O2",
|
|
|
|
|
-+ 'INC' => '-I@l_prefix@/include -I$(DBI_INSTARCH_DIR)',
|
|
|
|
|
|
|
+ 'OBJECT' => ($force_local) ? '$(O_FILES)' : 'SQLite.o dbdimp.o',
|
|
|
|
|
+- 'INC' => '-I. -I$(DBI_INSTARCH_DIR)' .
|
|
|
|
|
++ 'INC' => '-I@l_prefix@/include -I$(DBI_INSTARCH_DIR)' .
|
|
|
|
|
+ (($sqlite_inc) ? " -I$sqlite_inc" : ''),
|
|
|
+ 'LIBS' => ['-L@l_prefix@/lib -lsqlite3'],
|
|
+ 'LIBS' => ['-L@l_prefix@/lib -lsqlite3'],
|
|
|
- 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" .
|
|
|
|
|
- ($Config{d_usleep} ? " -DHAVE_USLEEP=1" : "") .
|
|
|
|
|
- ($DBI::VERSION > 1.42 ? '' : ' -Dno_last_insert_id'),
|
|
|
|
|
|
|
+ $force_local ? () : ('LIBS' => '-lsqlite3'),
|
|
|
|
|
+ $sqlite_lib ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) : (),
|
|
|
|
|
+ 'OPTIMIZE' => "-O2",
|
|
|
Index: dbdimp.h
|
|
Index: dbdimp.h
|
|
|
--- dbdimp.h.orig 2004-09-10 17:24:28 +0200
|
|
--- dbdimp.h.orig 2004-09-10 17:24:28 +0200
|
|
|
-+++ dbdimp.h 2004-09-24 10:44:37 +0200
|
|
|
|
|
|
|
++++ dbdimp.h 2005-06-21 21:01:54 +0200
|
|
|
@@ -4,7 +4,7 @@
|
|
@@ -4,7 +4,7 @@
|
|
|
#define _DBDIMP_H 1
|
|
#define _DBDIMP_H 1
|
|
|
|
|
|