Changeset 37389 for main/trunk/greenstone2/common-src/indexers/mgpp/configure

Timestamp:

2023-03-02T20:25:57+13:00 (14 months ago)

Author:

anupama

Message:

Make configure script for mg/mgpp choose between which Java framework to set as part of the JNILDFlAGS variable on a Mac, depending on version of xcode compile tools installed. Tested in separate bash script. Committing now in order to test with release-kit.

File:

• main/trunk/greenstone2/common-src/indexers/mgpp/configure (modified) (1 diff)

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

@@ -6112 +6112 @@
   JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "
   JNISUFFIX="jnilib"
-  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  knownMinXcodeVersionForNewJavaFramework=2395
+  xcodeVersion=`(xcode-select --version) 2> /dev/null`
+  if test "$?" -eq 127 || test "${xcodeVersion//[!0-9]/}" -lt $knownMinXcodeVersionForNewJavaFramework; then
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
+  else
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  fi
 fi
 if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then