Changeset 37415

Timestamp:

2023-03-06T15:41:51+13:00 (3 weeks ago)

Author:

anupama

Message:

Make configure script for javagdbm now to also 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. Related to Dr Bainbridge's recent commit revision 37405.

Location:

main/trunk/greenstone3/src/packages/javagdbm

Files:

• configure (modified) (1 diff)
• configure.in (modified) (1 diff)

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

@@ -4028 +4028 @@
   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

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

@@ -214 +214 @@
   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