Index: DBD-SQLite-1.25/Makefile.PL
--- DBD-SQLite-1.25/Makefile.PL.orig	2009-04-14 17:43:16 +0200
+++ DBD-SQLite-1.25/Makefile.PL	2009-04-15 18:18:30 +0200
@@ -17,46 +17,7 @@
 	return @_;
 }
 
-# Are we upgrading from a critically out of date version?
-eval {
-	require DBD::SQLite;
-	if ( $DBD::SQLite::VERSION < 1.0 ) {
-		print <<EOT;
-
-**** WARNING **** WARNING **** WARNING **** WARNING **** WARNING ****
-
-Your version of DBD::SQLite currently installed ($DBD::SQLite::VERSION) uses
-the old sqlite database format. This version of DBD::SQLite will *NOT*
-open these files, and installing this module may cause problems on your
-system. If this is a live environment you should upgrade with caution.
-
-To upgrade a database, download and install both sqlite 2.x and 3.x from
-http://www.sqlite.org/ and issue:
-
-  sqlite OLD.DB .dump | sqlite3 NEW.DB
-
-DBD::SQLite will NOT automatically upgrade a database for you, and using
-this version against an old SQLite database WILL lead to database
-corruption.
-
-EOT
-		if ( prompt("Continue?", "N") !~ /^y/i ) {
-			print "Exiting\n";
-			exit(-1);
-		}
-	}
-};
-
-# Because DBI generates a postamble at configure-time, we need
-# the required version of DBI very early.
 my $DBI_required = 1.57;
-eval {
-	require DBI;
-};
-if ( $@ or DBI->VERSION < $DBI_required ) {
-	print "DBI 1.57 is required to configure this module, please install it or upgrade your CPAN/CPANPLUS shell\n";
-	exit(0);
-}
 
 # 2005/6/19, by rjray@blackperl.com
 #
@@ -154,20 +115,17 @@
 # Prepare Compiler Options
 
 my @CC_LIBS = ();
-if ( $sqlite_lib ) {
-	push @CC_LIBS, "-L$sqlite_lib";
-}
-unless ( $force_local ) {
-	push @CC_LIBS, '-lsqlite3';
-}
+my $libs = `@l_prefix@/bin/pkg-config sqlite3 --libs`;
+$libs =~ s/\r?\n$//s;
+push @CC_LIBS, $libs;
 
+my $inc = `@l_prefix@/bin/pkg-config sqlite3 --cflags-only-I`;
+$inc =~ s/\r?\n$//s;
 my @CC_INC = (
 	'-I.',
 	'-I$(DBI_INSTARCH_DIR)',
 );
-if ( $sqlite_inc ) {
-	push @CC_INC, "-I$sqlite_inc";
-}
+unshift @INC, $inc;
 
 my @CC_DEFINE = (
 	'-DSQLITE_CORE',
Index: DBD-Sybase-1.09/dbdimp.c
--- DBD-Sybase-1.09/dbdimp.c.orig	2008-08-31 14:08:17 +0200
+++ DBD-Sybase-1.09/dbdimp.c	2009-04-15 18:18:30 +0200
@@ -774,22 +774,22 @@
 
 #if defined(CS_VERSION_150)
 	if(cs_ver == CS_VERSION_150)
-		BLK_VERSION = BLK_VERSION_150;
+		BLK_VERSION = CS_VERSION_150;
 #endif
 #if defined(CS_VERSION_125)
 	if(cs_ver == CS_VERSION_125)
-		BLK_VERSION = BLK_VERSION_125;
+		BLK_VERSION = CS_VERSION_125;
 #endif
 #if defined(CS_VERSION_120)
 	if(cs_ver == CS_VERSION_120)
-		BLK_VERSION = BLK_VERSION_120;
+		BLK_VERSION = CS_VERSION_120;
 #endif
 #if defined(CS_VERSION_110)
 	if(cs_ver == CS_VERSION_110)
-		BLK_VERSION = BLK_VERSION_110;
+		BLK_VERSION = CS_VERSION_110;
 #endif
 	if (cs_ver == CS_VERSION_100)
-		BLK_VERSION = BLK_VERSION_100;
+		BLK_VERSION = CS_VERSION_100;
 
 #if USE_CSLIB_CB
 	if (cs_config(context, CS_SET, CS_MESSAGE_CB,
Index: DBD-cego/Makefile.PL
--- DBD-cego/Makefile.PL.orig	2009-04-09 17:37:51 +0200
+++ DBD-cego/Makefile.PL	2009-04-15 18:18:55 +0200
@@ -43,7 +43,7 @@
     'VERSION_FROM'  => 'Cego.pm',
     'PREREQ_PM'     => {DBI => 1.03},
     'OBJECT'        => '$(O_FILES)',
-    'INC'           => '-I$(DBI_INSTARCH_DIR) -I' . $opt->{'prefix'} . '/include',
+    'INC'           => '-I$(DBI_INSTARCH_DIR) -I' . $opt->{'prefix'} . '/include/cego',
     'MYEXTLIB'    => $opt->{'prefix'} . "/lib/libcego.a " 
 	      . $opt->{'prefix'} . "/lib/libXML.a " 
 	      . $opt->{'prefix'} . "/lib/libBase.a",
Index: DBD-mysql-4.011/dbdimp.h
--- DBD-mysql-4.011/dbdimp.h.orig	2009-04-13 14:10:40 +0200
+++ DBD-mysql-4.011/dbdimp.h	2009-04-15 18:18:30 +0200
@@ -19,6 +19,7 @@
  *  Header files we use
  */
 #include <DBIXS.h>  /* installed by the DBI module                        */
+#include <my_global.h>
 #include <mysql.h>  /* Comes with MySQL-devel */
 #include <mysqld_error.h>  /* Comes MySQL */