Changeset 26672

Timestamp:

2013-01-10T16:27:16+13:00 (11 years ago)

Author:

davidb

Message:

Changes necessary to support cross-compilation using mingw under Linux for Windows native binaries. crossOS environment variable used to signal that this is a Greenstone being cross-compiles. Other changes focus on control of compile flags to ensure the correct dll/so files with the right naming convensions are produced

Location:

main/trunk/greenstone3/src/packages/javagdbm

Files:

• configure (modified) (6 diffs)
• configure.in (modified) (3 diffs)

main/trunk/greenstone3/src/packages/javagdbm/configure

@@ -1 +1 @@
 #! /bin/sh
-# From configure.in Revision: 21433 .
+# From configure.in Revision: 25493 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68.
@@ -603 +603 @@
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-JNIFLAGS
+JNILDFLAGS
+JNICFLAGS
 JNISUFFIX
+JNIPREFIX
 JNIINC
 PKG
@@ -3697 +3699 @@
 if test "z$JAVA_HOME" != z &&
    test -d $JAVA_HOME &&
-   test -d $JAVA_HOME/include
+   (test -d $JAVA_HOME/include || test -d $JAVA_HOME/../Headers)
 then
 
@@ -3926 +3928 @@
 # set defaults
 JNIINC=""
+JNIPREFIX="lib"
 JNISUFFIX="so"
-JNIFLAGS="-shared"
+JNICFLAGS=""
+JNILDFLAGS="-shared"
 
 if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
@@ -3934 +3938 @@
   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
@@ -3944 +3948 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5
 $as_echo "Linux" >&6; }
-  JNIINC="-I\$(JAVA_HOME)/include/linux "
-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
+
+
 
 

main/trunk/greenstone3/src/packages/javagdbm/configure.in

@@ -195 +195 @@
 # set defaults
 JNIINC=""
+JNIPREFIX="lib"
 JNISUFFIX="so"
-JNIFLAGS="-shared"
+JNICFLAGS=""
+JNILDFLAGS="-shared"
 
 if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
@@ -202 +204 @@
   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
@@ -210 +212 @@
 if test "`(uname -s) 2> /dev/null`" = 'Linux'; then
   AC_MSG_RESULT(Linux)
-  JNIINC="-I\$(JAVA_HOME)/include/linux "
+  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)
 
 # write the output