bk commit - dbd-mysql tree (ranger:1.10)

[ranger]

Below is the list of changes that have just been committed into a local
dbd-mysql repository of elf. When elf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.10 04/08/06 03:12:45 ranger@stripped +2 -0
  Improved handling of 'mysql_config' option
  Restored value of INPUT_RECORD_SEPARATOR variable. This fix the problem of building of
embbeded 
  driver on some systems
  Cleanups
   

  Makefile.PL
    1.4 04/08/06 03:12:45 ranger@stripped +33 -34
    Improved handling of 'mysql_config' option
    Cleanups

  Makefile.PL.embedded
    1.2 04/08/06 03:12:45 ranger@stripped +4 -3
    Restored value of INPUT_RECORD_SEPARATOR variable
    Cleanups

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ranger
# Host:	regul.home.lan
# Root:	/home/elf/projects/DBD-mysql/dbd-mysql

--- 1.3/Makefile.PL	2004-08-04 23:36:42 +03:00
+++ 1.4/Makefile.PL	2004-08-06 03:12:45 +03:00
@@ -37,8 +37,34 @@
 
 my $source = {};
 
-foreach my $key (qw/testdb testhost testuser testpassword testsocket cflags embedded 
-                    libs nocatchstderr ssl nofoundrows/)
+
+#Check for mysql_config first
+$source->{'mysql_config'}="guessed";
+if ($opt->{'mysql_config'})
+{  
+  if (-e $opt->{'mysql_config'})
+  {
+    $source->{'mysql_config'} = "Users choice";
+  }
+  else
+  {
+    print <<"MSG";
+
+Specified mysql configuration script '$opt->{'mysql_config'}' doesn't exist. 
+Please check path/permissions. Will try to use default mysql_config 
+script found through PATH.
+MSG
+    $opt->{'mysql_config'}= "mysql_config";
+  }
+}
+else
+{
+  $opt->{'mysql_config'}= "mysql_config";
+}
+
+
+foreach my $key (qw/testdb testhost testuser testpassword testsocket 
+                    cflags embedded libs nocatchstderr ssl nofoundrows/)
 {
   Configure($opt, $source, $key);
 }
@@ -69,25 +95,24 @@
 
 Please use
 
-  perl Makefile.PL "--embedded=-L<dir>"
+  perl Makefile.PL --embedded="-L<dir> <flags>"
 
 to set correct directory. For details see the INSTALL.html file,
 section "Linker flags" or type
 
   perl Makefile.PL --help
 MSG
-
      $source->{'embedded'} = "guessed";
      $opt->{'embedded'}="";
   }
 }
 
-if ($opt->{'embedded'} && !check_include_version($opt->{'cflags'}, 40103))
{
+if ($opt->{'embedded'} && !check_include_version($opt->{'cflags'}, 40003))
{
   die <<"MSG";
 
 WARNING: Wrong version or unable to check version of mysql include files.
 To build embedded  version of DBD you ought to be shure that you use include
-files from MySQL server >= 4.1.3.
+files from MySQL server >= 4.0.3.
 
 MSG
 }
@@ -165,7 +190,6 @@
 
 my %embedded_files=();
 
-undef $opt->{'embedded'};
 if ($opt->{'embedded'})
 {
 
@@ -275,15 +299,9 @@
 
   my %e=%o;
 
-  foreach my $file (keys %embedded_files)
-  {
-    $e{'clean'}->{'FILES'} .= " $embedded_files{$file}->{filename}";
-  }
-
   $o{'clean'}->{'FILES'} .= " ./mysqlEmb";
   $o{'DIR'}=['mysqlEmb'];
 
-
   $e{'NAME'} = 'DBD::mysqlEmb';
   $e{'C'} = ["dbdimp.c", "mysqlEmb.c"];
   $e{'XS'} = {'mysqlEmb.xs' => 'mysqlEmb.c'};
@@ -389,29 +407,10 @@
     return;
   }
 
-  # First try to detect path for mysql_config
-  my $config="mysql_config";
-
-  if ($opt->{'mysql_config'} && !$source->{'mysql_config'})
-  {  
-    $source->{'mysql_config'} = "Users choice";
-    if (-e $opt->{'mysql_config'}."/".$config)
-    {
-      $config = $opt->{'mysql_config'}."/".$config;
-    }
-    else
-    {
-      print <<"MSG";
-
-File $opt->{'mysql_config'}/$config not exist. Please check path/permissions.
-Will try to use default mysql_config script found through PATH.
-MSG
-    }
-  }
-  
+  # First try to get options values from mysql_config
   eval 
   {
-    open(PIPE, "$config --$param |") or die "Can't find mysql_config.";
+    open(PIPE, "$opt->{'mysql_config'} --$param |") or die "Can't find mysql_config.";
   };
 
   if (!$@)

--- 1.1/Makefile.PL.embedded	2004-07-27 21:15:44 +03:00
+++ 1.2/Makefile.PL.embedded	2004-08-06 03:12:45 +03:00
@@ -1,6 +1,8 @@
 use ExtUtils::MakeMaker;
 use File::Path;
 
+$/="\n";
+
 chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
 require "$pwd/Makefile.conf" || die "Can't read Configuration file: $!\n";
 
@@ -9,11 +11,10 @@
   eval { mkpath "$pwd/t/test" };
   if ($@)
   {
-    print "Couldn't create $dir for test database: $@\n";
+    print "Couldn't create $pwd/t/test directory for test database: $@\n";
   }
 }
-
-WriteMakefile(%{$o});
+ExtUtils::MakeMaker::WriteMakefile(%{$o});
 
 package MY;