Changeset 35576 for main/trunk


Ignore:
Timestamp:
2021-10-13T23:38:55+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/indexers
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r35306 r35576  
    8585])
    8686AC_PROVIDE([$0])dnl
    87 if test "x$JAVACFLAGS" = x ; then
    88   JAVACFLAGS="-source 1.6 -target 1.6"
    89 fi
     87dnl The following is now explicitly set in the Release Kit
     88dnl if test "x$JAVACFLAGS" = x ; then
     89dnl   JAVACFLAGS="-source 1.6 -target 1.6"
     90dnl fi
    9091AC_SUBST(JAVACFLAGS)
    9192])

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

    r35306 r35576  
    19491949{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
    19501950$as_echo "$ac_cv_prog_javac_works" >&6; }
    1951 if test "x$JAVACFLAGS" = x ; then
    1952   JAVACFLAGS="-source 1.6 -target 1.6"
    1953 fi
    19541951
    19551952
    … …  
    21072104        ac_cv_prog_uudecode_base64=yes
    21082105else
    2109         echo "configure: 2109: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     2106        echo "configure: 2106: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    21102107        echo "configure: failed file was:" >&5
    21112108        cat Test.uue >&5
    … …  
    22302227CLASS_TEST=Test.class
    22312228cat << \EOF > $JAVA_TEST
    2232 /* #line 2232 "configure" */
     2229/* #line 2229 "configure" */
    22332230public class Test {
    22342231}
    … …  
    22512248{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
    22522249$as_echo "$ac_cv_prog_javac_works" >&6; }
    2253 if test "x$JAVACFLAGS" = x ; then
    2254   JAVACFLAGS="-source 1.6 -target 1.6"
    2255 fi
    22562250
    22572251
    … …  
    22692263TEST=Test
    22702264cat << \EOF > $JAVA_TEST
    2271 /* [#]line 2271 "configure" */
     2265/* [#]line 2265 "configure" */
    22722266public class Test {
    22732267public static void main (String args[]) {

  • main/trunk/greenstone2/common-src/indexers/mg/aclocal.m4

    r35306 r35576  
    225225])
    226226AC_PROVIDE([$0])dnl
    227 if test "x$JAVACFLAGS" = x ; then
    228   JAVACFLAGS="-source 1.6 -target 1.6"
    229 fi
     227dnl The following is now explicitly set in the Release Kit
     228dnl if test "x$JAVACFLAGS" = x ; then
     229dnl   JAVACFLAGS="-source 1.6 -target 1.6"
     230dnl fi
    230231AC_SUBST(JAVACFLAGS)
    231232])

  • main/trunk/greenstone2/common-src/indexers/mg/configure

    r35374 r35576  
    41094109{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
    41104110$as_echo "$ac_cv_prog_javac_works" >&6; }
    4111 if test "x$JAVACFLAGS" = x ; then
    4112   JAVACFLAGS="-source 1.6 -target 1.6"
    4113 fi
    41144111
    41154112
    … …  
    41274124TEST=Test
    41284125cat << \EOF > $JAVA_TEST
    4129 /* [#]line 4129 "configure" */
     4126/* [#]line 4126 "configure" */
    41304127public class Test {
    41314128public static void main (String args[]) {
    … …  
    42724269CLASS_TEST=Test.class
    42734270cat << \EOF > $JAVA_TEST
    4274 /* #line 4274 "configure" */
     4271/* #line 4271 "configure" */
    42754272public class Test {
    42764273}
    … …  
    42934290{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
    42944291$as_echo "$ac_cv_prog_javac_works" >&6; }
    4295 if test "x$JAVACFLAGS" = x ; then
    4296   JAVACFLAGS="-source 1.6 -target 1.6"
    4297 fi
    42984292
    42994293

  • main/trunk/greenstone2/common-src/indexers/mgpp/aclocal.m4

    r35306 r35576  
    309309])
    310310AC_PROVIDE([$0])dnl
    311 if test "x$JAVACFLAGS" = x ; then
    312    JAVACFLAGS="-source 1.6 -target 1.6"
    313 fi
     311dnl The following is now explicitly set in the Release Kit
     312dnl if test "x$JAVACFLAGS" = x ; then
     313dnl    JAVACFLAGS="-source 1.6 -target 1.6"
     314dnl fi
    314315AC_SUBST(JAVACFLAGS)
    315316])

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

    r35375 r35576  
    43314331{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
    43324332$as_echo "$ac_cv_prog_javac_works" >&6; }
    4333 if test "x$JAVACFLAGS" = x ; then
    4334    JAVACFLAGS="-source 1.6 -target 1.6"
    4335 fi
    43364333
    43374334
    … …  
    43494346TEST=Test
    43504347cat << \EOF > $JAVA_TEST
    4351 /* [#]line 4351 "configure" */
     4348/* [#]line 4348 "configure" */
    43524349public class Test {
    43534350public static void main (String args[]) {
    … …  
    44944491CLASS_TEST=Test.class
    44954492cat << \EOF > $JAVA_TEST
    4496 /* #line 4496 "configure" */
     4493/* #line 4493 "configure" */
    44974494public class Test {
    44984495}
    … …  
    45154512{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_javac_works" >&5
    45164513$as_echo "$ac_cv_prog_javac_works" >&6; }
    4517 if test "x$JAVACFLAGS" = x ; then
    4518    JAVACFLAGS="-source 1.6 -target 1.6"
    4519 fi
    45204514
    45214515
Note: See TracChangeset for help on using the changeset viewer.