Changeset 35577

Timestamp:

2021-10-13T23:39:12+13:00 (3 years ago)

Author:

davidb

Message:

No longer want JAVACFLAGS set to default vals if not already set

Location:

main/trunk/greenstone2/common-src

Files:

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

main/trunk/greenstone2/common-src/aclocal.m4

@@ -225 +225 @@
 ])
 AC_PROVIDE([$0])dnl
-if test "x$JAVACFLAGS" = x ; then
-  JAVACFLAGS="-source 1.6 -target 1.6"
-fi
+dnl The following is now explicitly set in the Release Kit
+dnl if test "x$JAVACFLAGS" = x ; then
+dnl   JAVACFLAGS="-source 1.6 -target 1.6"
+dnl fi
 AC_SUBST(JAVACFLAGS)
 ])

main/trunk/greenstone2/common-src/configure

@@ -3933 +3933 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
 $as_echo "$ac_cv_prog_javac_works" >&6; }
-if test "x$JAVACFLAGS" = x ; then
-  JAVACFLAGS="-source 1.6 -target 1.6"
-fi
 
 
@@ -3951 +3948 @@
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 3953 "configure" */
+/* [#]line 3950 "configure" */
 public class Test {
 public static void main (String args[]) {
@@ -4096 +4093 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 4098 "configure" */
+/* #line 4095 "configure" */
 public class Test {
 }
@@ -4117 +4114 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
 $as_echo "$ac_cv_prog_javac_works" >&6; }
-if test "x$JAVACFLAGS" = x ; then
-  JAVACFLAGS="-source 1.6 -target 1.6"
-fi