Changeset 35374


Ignore:
Timestamp:
2021-09-13T18:51:45+12:00 (3 years ago)
Author:
davidb
Message:

MacOS JNI code updated to work off JAVA_HOME, in line with approach taken with Linux

Location:
main/trunk/greenstone2/common-src/indexers/mg
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r35306 r35374  
    58175817  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
    58185818$as_echo "Darwin" >&6; }
    5819   JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ "
     5819  JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "
    58205820  JNISUFFIX="jnilib"
    58215821  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"

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

    r26675 r35374  
    132132if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
    133133  AC_MSG_RESULT(Darwin)
    134   JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ "
     134  JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include " 
    135135  JNISUFFIX="jnilib"
    136136  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
Note: See TracChangeset for help on using the changeset viewer.