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

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.in (modified) (3 diffs)

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

@@ -125 +125 @@
 # set defaults
 JNIINC=""
+JNIPREFIX="lib"
 JNISUFFIX="so"
-JNIFLAGS="-shared"
+JNICFLAGS=""
+JNILDFLAGS="-shared"
 
 if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
@@ -132 +134 @@
   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
@@ -140 +142 @@
 if test "`(uname -s) 2> /dev/null`" = 'Linux'; then
   AC_MSG_RESULT(Linux)
-  JNIINC="-I\$(JAVA_HOME)/include/linux -I\$(JAVA_HOME)/include "
+  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
 
 AC_SUBST(JNIINC)
+AC_SUBST(JNIPREFIX)
 AC_SUBST(JNISUFFIX)
-AC_SUBST(JNIFLAGS)
+AC_SUBST(JNICFLAGS)
+AC_SUBST(JNILDFLAGS)
 
 fp_WITH_DMALLOC