Changeset 26672

Show
Ignore:
Timestamp:
10.01.2013 16:27:16 (6 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/packages/javagdbm/configure

    r25173 r26672  
    11#! /bin/sh 
    2 # From configure.in Revision: 21433 . 
     2# From configure.in Revision: 25493 . 
    33# Guess values for system-dependent variables and create Makefiles. 
    44# Generated by GNU Autoconf 2.68. 
     
    603603ac_subst_vars='LTLIBOBJS 
    604604LIBOBJS 
    605 JNIFLAGS 
     605JNILDFLAGS 
     606JNICFLAGS 
    606607JNISUFFIX 
     608JNIPREFIX 
    607609JNIINC 
    608610PKG 
     
    36973699if test "z$JAVA_HOME" != z && 
    36983700   test -d $JAVA_HOME && 
    3699    test -d $JAVA_HOME/include 
     3701   (test -d $JAVA_HOME/include || test -d $JAVA_HOME/../Headers) 
    37003702then 
    37013703 
     
    39263928# set defaults 
    39273929JNIINC="" 
     3930JNIPREFIX="lib" 
    39283931JNISUFFIX="so" 
    3929 JNIFLAGS="-shared" 
     3932JNICFLAGS="" 
     3933JNILDFLAGS="-shared" 
    39303934 
    39313935if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
     
    39343938  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    39353939  JNISUFFIX="jnilib" 
    3936   JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
     3940  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
    39373941fi 
    39383942if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     
    39443948  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5 
    39453949$as_echo "Linux" >&6; } 
    3946   JNIINC="-I\$(JAVA_HOME)/include/linux " 
    3947 fi 
     3950  JNIINC="-I\$(JAVA_HOME)/include/linux -I\$(JAVA_HOME)/in5Aclude " 
     3951fi 
     3952 
     3953if test "x$crossOS" != "x" ; then 
     3954  if test "$crossOS" = "windows" ; then 
     3955    JNIINC="-I../java-windows-include/win32 -I../java-windows-include " 
     3956    JNICFLAGS="-Wall -D_JNI_IMPLEMENTATION_ -Wl,--kill-at" 
     3957    JNIPREFIX="" 
     3958    JNISUFFIX="dll" 
     3959  fi 
     3960fi 
     3961 
     3962 
    39483963 
    39493964 
  • main/trunk/greenstone3/src/packages/javagdbm/configure.in

    r25493 r26672  
    195195# set defaults 
    196196JNIINC="" 
     197JNIPREFIX="lib" 
    197198JNISUFFIX="so" 
    198 JNIFLAGS="-shared" 
     199JNICFLAGS="" 
     200JNILDFLAGS="-shared" 
    199201 
    200202if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
     
    202204  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    203205  JNISUFFIX="jnilib" 
    204   JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
     206  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
    205207fi 
    206208if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     
    210212if test "`(uname -s) 2> /dev/null`" = 'Linux'; then 
    211213  AC_MSG_RESULT(Linux) 
    212   JNIINC="-I\$(JAVA_HOME)/include/linux " 
     214  JNIINC="-I\$(JAVA_HOME)/include/linux -I\$(JAVA_HOME)/in5Aclude " 
     215fi 
     216 
     217if test "x$crossOS" != "x" ; then 
     218  if test "$crossOS" = "windows" ; then 
     219    JNIINC="-I../java-windows-include/win32 -I../java-windows-include " 
     220    JNICFLAGS="-Wall -D_JNI_IMPLEMENTATION_ -Wl,--kill-at" 
     221    JNIPREFIX="" 
     222    JNISUFFIX="dll" 
     223  fi 
    213224fi 
    214225 
    215226AC_SUBST(JNIINC) 
     227AC_SUBST(JNIPREFIX) 
    216228AC_SUBST(JNISUFFIX) 
    217 AC_SUBST(JNIFLAGS) 
     229AC_SUBST(JNICFLAGS) 
     230AC_SUBST(JNILDFLAGS) 
    218231 
    219232# write the output