Changeset 26656 for main/trunk/greenstone2/common-src/indexers/mg/configure

Timestamp:

2013-01-10T15:42:38+13:00 (11 years ago)

Author:

davidb

Message:

Support for cross-compilation added. In addition to the CrossOS check, this particular set of changes focus on flags that assist cross-compilation with JNI

File:

• main/trunk/greenstone2/common-src/indexers/mg/configure (modified) (8 diffs)

main/trunk/greenstone2/common-src/indexers/mg/configure

@@ -601 +601 @@
 
 ac_subst_vars='LTLIBOBJS
-JNIFLAGS
+JNILDFLAGS
+JNICFLAGS
 JNISUFFIX
+JNIPREFIX
 JNIINC
 LIBOBJS
@@ -3934 +3936 @@
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 3936: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 3938: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
@@ -4057 +4059 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 4059 "configure" */
+/* #line 4061 "configure" */
 public class Test {
 }
@@ -4096 +4098 @@
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 4098 "configure" */
+/* [#]line 4100 "configure" */
 public class Test {
 public static void main (String args[]) {
@@ -4241 +4243 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 4243 "configure" */
+/* #line 4245 "configure" */
 public class Test {
 }
@@ -5780 +5782 @@
 # set defaults
 JNIINC=""
+JNIPREFIX="lib"
 JNISUFFIX="so"
-JNIFLAGS="-shared"
+JNICFLAGS=""
+JNILDFLAGS="-shared"
 
 if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
@@ -5788 +5792 @@
   JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ "
   JNISUFFIX="jnilib"
-  JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
+  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
 fi
 if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then
@@ -5798 +5802 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5
 $as_echo "Linux" >&6; }
-  JNIINC="-I\$(JAVA_HOME)/include/linux -I\$(JAVA_HOME)/include "
-fi
+  JNIINC="-I\$(JAVA_HOME)/include/linux -I\$(JAVA_HOME)/in5Aclude "
+fi
+
+if test "x$crossOS" != "x" ; then
+  if test "$crossOS" = "windows" ; then
+    JNIINC="-I../../java-windows-include/win32 -I../../java-windows-include "
+    JNICFLAGS="-Wall -D_JNI_IMPLEMENTATION_ -Wl,--kill-at"
+    JNIPREFIX=""
+    JNISUFFIX="dll"
+  fi
+fi
+
+