version thing again

diff --git a/perl/ChangeLog b/perl/ChangeLog
index 2ba7698..bbcf156 100644 (file)
--- a/perl/ChangeLog
+++ b/perl/ChangeLog
@@ -1,3 +1,4 @@
+Version 0.64 --        25 September 2001   <skimo@kotnet.org> Sven Verdoolaege
 Version 0.63 --        24 September 2001   <skimo@kotnet.org> Sven Verdoolaege
 
        o Update build process

diff --git a/perl/FCGI.PL b/perl/FCGI.PL
index b6e38d2..bb35470 100644 (file)
--- a/perl/FCGI.PL
+++ b/perl/FCGI.PL
@@ -1,4 +1,5 @@
 use Config;
+use ExtUtils::MakeMaker;
 
 do 'FCGI.cfg' or die "no FCGI.cfg";
 
@@ -6,7 +7,7 @@ open OUT, ">FCGI.pm";
 
 print "Generating FCGI.pm\n";
 print OUT <<'EOP';
-# $Id: FCGI.PL,v 1.32 2001/09/21 15:54:34 skimo Exp $
+# $Id: FCGI.PL,v 1.33 2001/09/25 08:21:27 skimo Exp $
 
 package FCGI;
 
@@ -23,12 +24,7 @@ require DynaLoader;
 
 EOP
 
-{
-    open VERSION, "version.pm";
-    local $/ = undef;
-    print OUT <VERSION>;
-    close VERSION;
-}
+print OUT '$VERSION = '.MM->parse_version('version.pm').";\n\n";
 
 print OUT "bootstrap FCGI;\n" unless ($pure);
 

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 416fac4..d075c59 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -1,4 +1,4 @@
-# $Id: Makefile.PL,v 1.29 2001/09/24 18:03:08 skimo Exp $
+# $Id: Makefile.PL,v 1.30 2001/09/25 08:21:27 skimo Exp $
 
 use ExtUtils::MakeMaker;
 use IO::File;
@@ -29,17 +29,14 @@ if (! $pure) {
 
     if (defined $useinstalled) {
        require ExtUtils::Liblist;
-       my $mm = MM->new({NAME => 'FCGI'});
        my $libspec = $useinstalled ? "-L$useinstalled/lib " : "";
        $libspec .= "-lfcgi";
-       my @l = $mm->ext($libspec);
+       my @l = MM->ext($libspec);
        if ($l[0] || $l[1] || $l[2]) {
            $prefix = "$useinstalled/include" if $useinstalled;
            $libfound = 1;
            push @libs, $libspec;
        }
-       # avoid duplicate check for complete kit
-       ExtUtils::MakeMaker::WriteEmptyMakefile() if ! -f "Makefile";
     }
     if (!$libfound && -d "$devkit/libfcgi" && -d "$devkit/include") {
        # devkit

diff --git a/perl/version.pm b/perl/version.pm
index 98e7226..179c8f4 100644 (file)
--- a/perl/version.pm
+++ b/perl/version.pm
@@ -1,2 +1,3 @@
-$FCGI::VERSION = '0.63';
+package FCGI;
 
+$VERSION = '0.64';