Changeset 35376


Ignore:
Timestamp:
2021-09-13T19:03:13+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/greenstone3/src/packages/javagdbm
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r35307 r35376  
    40294029  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
    40304030$as_echo "Darwin" >&6; }
    4031   JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ "
     4031  JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "
    40324032  JNISUFFIX="jnilib"
    40334033  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"

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

    r33928 r35376  
    212212if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
    213213  AC_MSG_RESULT(Darwin)
    214   JNIINC="-I/System/Library/Frameworks/JavaVM.framework/Headers/ "
     214  JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "
    215215  JNISUFFIX="jnilib"
    216216  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
Note: See TracChangeset for help on using the changeset viewer.