Show
Ignore:
Timestamp:
10.01.2013 15:42:38 (7 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/mg/configure

    r25169 r26656  
    601601 
    602602ac_subst_vars='LTLIBOBJS 
    603 JNIFLAGS 
     603JNILDFLAGS 
     604JNICFLAGS 
    604605JNISUFFIX 
     606JNIPREFIX 
    605607JNIINC 
    606608LIBOBJS 
     
    39343936        ac_cv_prog_uudecode_base64=yes 
    39353937else 
    3936         echo "configure: 3936: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 
     3938        echo "configure: 3938: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 
    39373939        echo "configure: failed file was:" >&5 
    39383940        cat Test.uue >&5 
     
    40574059CLASS_TEST=Test.class 
    40584060cat << \EOF > $JAVA_TEST 
    4059 /* #line 4059 "configure" */ 
     4061/* #line 4061 "configure" */ 
    40604062public class Test { 
    40614063} 
     
    40964098TEST=Test 
    40974099cat << \EOF > $JAVA_TEST 
    4098 /* [#]line 4098 "configure" */ 
     4100/* [#]line 4100 "configure" */ 
    40994101public class Test { 
    41004102public static void main (String args[]) { 
     
    42414243CLASS_TEST=Test.class 
    42424244cat << \EOF > $JAVA_TEST 
    4243 /* #line 4243 "configure" */ 
     4245/* #line 4245 "configure" */ 
    42444246public class Test { 
    42454247} 
     
    57805782# set defaults 
    57815783JNIINC="" 
     5784JNIPREFIX="lib" 
    57825785JNISUFFIX="so" 
    5783 JNIFLAGS="-shared" 
     5786JNICFLAGS="" 
     5787JNILDFLAGS="-shared" 
    57845788 
    57855789if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then 
     
    57885792  JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ " 
    57895793  JNISUFFIX="jnilib" 
    5790   JNIFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
     5794  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM" 
    57915795fi 
    57925796if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then 
     
    57985802  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5 
    57995803$as_echo "Linux" >&6; } 
    5800   JNIINC="-I\$(JAVA_HOME)/include/linux -I\$(JAVA_HOME)/include " 
    5801 fi 
     5804  JNIINC="-I\$(JAVA_HOME)/include/linux -I\$(JAVA_HOME)/in5Aclude " 
     5805fi 
     5806 
     5807if test "x$crossOS" != "x" ; then 
     5808  if test "$crossOS" = "windows" ; then 
     5809    JNIINC="-I../../java-windows-include/win32 -I../../java-windows-include " 
     5810    JNICFLAGS="-Wall -D_JNI_IMPLEMENTATION_ -Wl,--kill-at" 
     5811    JNIPREFIX="" 
     5812    JNISUFFIX="dll" 
     5813  fi 
     5814fi 
     5815 
     5816 
    58025817 
    58035818