Changeset 5016

Timestamp:

2003-07-23T16:41:47+12:00 (21 years ago)

Author:

jrm21

Message:

minor fixes for portability

1) look for java on the path instead of hard-coded path

2) #define u_char if it isn't already defined.

Location:

trunk/gsdl/perllib/Kea-1.1.4

Files:

• Iterated-Lovins-stemmer/stem.c (modified) (1 diff)
• Kea (modified) (1 diff)

trunk/gsdl/perllib/Kea-1.1.4/Iterated-Lovins-stemmer/stem.c

@@ -22 +22 @@
  **************************************************************************/
 
-static char *RCSID = "$Id$";
-
 #include <stdlib.h>
 //#include "sysfuncs.h"
+
+// need this eg for darwin
+#ifndef u_char
+# define u_char unsigned char
+#endif
 
 

trunk/gsdl/perllib/Kea-1.1.4/Kea

@@ -78 +78 @@
 $java_extra_args = "-ss100000000 -oss100000000 -mx200000000";
 
+# see if java executable is on path
+my $java_exec="";
+if (system("which java >/dev/null 2>/dev/null")==0) {
+    $java_exec=`which java`;
+} else {
+    $java_exec="$java_home/bin/java";
+}
+
 # The actual java command is based on these other variables:
-$java_command = "$java_home/bin/java -classpath \"$java_classpath\"";
+$java_command = "$java_exec -classpath \"$java_classpath\"";
 $java_command .= " -Djava.compiler=$java_JIT_compiler" if ($java_JIT_compiler);
 $java_command .= " $java_extra_args" if ($java_extra_args);