Changeset 35307

Timestamp:

2021-08-18T11:08:20+12:00 (3 years ago)

Author:

davidb

Message:

Making javac default now source/target 1.6, rather than 1.4. This change was in response to 'javah' being deprecated. JNI is now down with 'javac -h' and to do that, you need to have at least a JDK 1.6 installed

Location:

main/trunk/greenstone3/src/packages/javagdbm

Files:

• aclocal.m4 (modified) (1 diff)
• configure (modified) (3 diffs)

main/trunk/greenstone3/src/packages/javagdbm/aclocal.m4

@@ -226 +226 @@
 AC_PROVIDE([$0])dnl
 if test "x$JAVACFLAGS" = x ; then
-  JAVACFLAGS="-source 1.4 -target 1.4"
+  JAVACFLAGS="-source 1.6 -target 1.6"
 fi
 AC_SUBST(JAVACFLAGS)

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

@@ -1 +1 @@
 #! /bin/sh
-# From configure.in Revision: 26707 .
+# From configure.in Revision: 33928 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
@@ -3890 +3890 @@
 $as_echo "$ac_cv_prog_javac_works" >&6; }
 if test "x$JAVACFLAGS" = x ; then
-  JAVACFLAGS="-source 1.4 -target 1.4"
+  JAVACFLAGS="-source 1.6 -target 1.6"
 fi
 
@@ -4032 +4032 @@
   JNISUFFIX="jnilib"
   JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
-  if test -d "$JAVA_HOME/include/darwin"; then
-      JNICFLAGS="-I$JAVA_HOME/include -I$JAVA_HOME/include/darwin"
-  fi
 fi
 if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then