Changeset 35578 for main

Timestamp:

2021-10-13T23:40:05+13:00 (3 years ago)

Author:

davidb

Message:

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

Location:

main/trunk/greenstone2/build-src

Files:

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

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

@@ -226 +226 @@
 ])
 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/build-src/configure

@@ -3729 +3729 @@
 { $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
 
 
@@ -3887 +3884 @@
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 3889: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 3886: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
@@ -4011 +4008 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 4013 "configure" */
+/* #line 4010 "configure" */
 public class Test {
 }
@@ -4032 +4029 @@
 { $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
 
 
@@ -4050 +4044 @@
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 4052 "configure" */
+/* [#]line 4046 "configure" */
 public class Test {
 public static void main (String args[]) {