Changeset 35375


Ignore:
Timestamp:
2021-09-13T18:51:57+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/mgpp
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r35306 r35375  
    61166116  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
    61176117$as_echo "Darwin" >&6; }
    6118   JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ "
     6118  JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "
    61196119  JNISUFFIX="jnilib"
    61206120  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"

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

    r30866 r35375  
    172172if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
    173173  AC_MSG_RESULT(Darwin)
    174   JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ "
     174  JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "   
    175175  JNISUFFIX="jnilib"
    176176  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
Note: See TracChangeset for help on using the changeset viewer.