[cinvoke-svn] r139 - trunk/cinvoke

[will]

Author: will
Date: 2007-01-21 21:58:25 -0500 (Sun, 21 Jan 2007)
New Revision: 139

Modified:
   trunk/cinvoke/configure.pl
Log:
build fixes for RHEL


Modified: trunk/cinvoke/configure.pl
===================================================================
--- trunk/cinvoke/configure.pl  2007-01-21 03:14:32 UTC (rev 138)
+++ trunk/cinvoke/configure.pl  2007-01-22 02:58:25 UTC (rev 139)
@@ -14,7 +14,7 @@
 print "Using platform '$platform'\n";
 
 my $BUILDARCH = '-DARCH_GCC_' . $platform;
-my $CFLAGS = "-g -Wall -Werror -DCINVOKE_BUILD $BUILDARCH";
+my $CFLAGS = "-g -Wall -DCINVOKE_BUILD $BUILDARCH";
 my $ARCH_HEADER = 'gcc_' . lc($platform) . '.h';
 my $DYNEXT;
 my $JNIDYNEXT;
@@ -53,8 +53,14 @@
 } else {
        $DYNEXT = 'so';
        $JNIDYNEXT = 'so';
-       if ($SOLARIS) { $JNIINCLUDE = '-I/usr/jdk/latest/include 
-I/usr/jdk/latest/include/solaris'; }
-       else { $JNIINCLUDE = ''; }
+       my $jni_include_dir = find_jni();
+       if ($jni_include_dir) {
+               $JNIINCLUDE = "-I$jni_include_dir";
+               if ($SOLARIS) { $JNIINCLUDE .= " -I$jni_include_dir/solaris"; }
+               elsif ($LINUX) { $JNIINCLUDE .= " -I$jni_include_dir/linux"; }
+       } else {
+               $JNIINCLUDE = "";
+       }
        $BUILDSHARED = 'gcc -shared -o';
        $CXXBUILDSHARED = 'g++ -shared -o';
        if ($SOLARIS) { $DYNCFLAGS = ''; }
@@ -75,6 +81,17 @@
 print "Complete.\n";
 exit;
 
+sub find_jni {
+       my $ret = '/usr/jdk/default/include';
+       if (!(-d $ret)) {
+               $ret = '/usr/java/default/include';
+               if (!(-d $ret)) {
+                       $ret = '';
+               }
+       }
+       return $ret;
+}
+
 sub determine_platform {
        my $processor;