[libinline-java-perl] 226/398: *** empty log message ***

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag 0.55
in repository libinline-java-perl.

commit 4c0735c7b0a1fb000f3cea4635c2c05f40613321
Author: patrick_leb <>
Date:   Tue Apr 15 17:02:13 2003 +0000

    *** empty log message ***
---
 Java/Makefile.PL | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/Java/Makefile.PL b/Java/Makefile.PL
index 1109d22..45a1c30 100644
--- a/Java/Makefile.PL
+++ b/Java/Makefile.PL
@@ -22,6 +22,7 @@ my @files = (
 	'jni.h',
 	'jni_md.h',
 	$jvm_lib,
+	'jvm.cfg',
 ) ;
 if ($jvm_so ne $jvm_lib){
 	push @files, $jvm_so ;
@@ -36,6 +37,8 @@ my $files = {
 	},
 	$jvm_lib	=> {
 	},
+	'jvm.cfg'	=> {
+	},
 	$jvm_so		=> {
 	},
 } ;
@@ -174,27 +177,30 @@ sub CleanSoDirs {
 
 sub FindDefaultVMType {
 	my $type = undef ;
-	my $cfg = File::Spec->catfile($jdk_dir, "jre", "lib", "jvm.cfg") ;
-	if (open(CFG, "<$cfg")){
-		while (<CFG>){
-			my $line = $_ ;
-			chomp($line) ;
-			$line =~ s/^\s+// ;
-			$line =~ s/\s+$// ;
-
-			if (! $line){
-				next ;
-			}
-			elsif ($line =~ /^#/){
-				next ;
-			}
-			else{
-				$type = $line ;
-				$type =~ s/^-// ;
-				last ;
+	my $choices = $files->{'jvm.cfg'}->{choices} ;
+	if (scalar(@{$choices})){
+		my $cfg = File::Spec->catfile($choices->[0], 'jvm.cfg') ;
+		if (open(CFG, "<$cfg")){
+			while (<CFG>){
+				my $line = $_ ;
+				chomp($line) ;
+				$line =~ s/^\s+// ;
+				$line =~ s/\s+$// ;
+
+				if (! $line){
+					next ;
+				}
+				elsif ($line =~ /^#/){
+					next ;
+				}
+				else{
+					$type = split(/\s+/, $line) ;
+					$type =~ s/^-// ;
+					last ;
+				}
 			}
+			close(CFG) ;
 		}
-		close(CFG) ;
 	}
 
 	return $type ;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libinline-java-perl.git