Merge branch 'master' of git.dcc.fc.up.pt:yap-6.3

This commit is contained in:
Vitor Santos Costa 2014-07-09 13:35:51 -05:00
commit f9b948f4c3
2 changed files with 11 additions and 5 deletions

14
configure vendored
View File

@ -697,6 +697,7 @@ CLIB_CRYPTLIBS
CLIB_NETLIBS CLIB_NETLIBS
CLIB_PLTARGETS CLIB_PLTARGETS
CLIB_TARGETS CLIB_TARGETS
RFC822_CFLAGS
RFC2045_CFLAGS RFC2045_CFLAGS
RFC2045CHARSET RFC2045CHARSET
rfc822includedir rfc822includedir
@ -10815,6 +10816,8 @@ fi
done done
RFC822_CFLAGS="$SHLIB_CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to calculate alternate timezone" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to calculate alternate timezone" >&5
$as_echo_n "checking how to calculate alternate timezone... " >&6; } $as_echo_n "checking how to calculate alternate timezone... " >&6; }
if ${librfc822_cv_SYS_TIMEZONE+:} false; then : if ${librfc822_cv_SYS_TIMEZONE+:} false; then :
@ -10958,6 +10961,9 @@ fi
CLIB_TARGETS="socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO time.$SO" CLIB_TARGETS="socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO time.$SO"
case "$PLARCH" in case "$PLARCH" in
@ -13264,7 +13270,7 @@ else
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 13267 "configure" */ /* #line 13273 "configure" */
public class Test { public class Test {
} }
EOF EOF
@ -13440,7 +13446,7 @@ EOF
if uudecode$EXEEXT Test.uue; then if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes ac_cv_prog_uudecode_base64=yes
else else
echo "configure: 13443: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: 13449: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5 echo "configure: failed file was:" >&5
cat Test.uue >&5 cat Test.uue >&5
ac_cv_prog_uudecode_base64=no ac_cv_prog_uudecode_base64=no
@ -13571,7 +13577,7 @@ else
JAVA_TEST=Test.java JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* #line 13574 "configure" */ /* #line 13580 "configure" */
public class Test { public class Test {
} }
EOF EOF
@ -13606,7 +13612,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class CLASS_TEST=Test.class
TEST=Test TEST=Test
cat << \EOF > $JAVA_TEST cat << \EOF > $JAVA_TEST
/* [#]line 13609 "configure" */ /* [#]line 13615 "configure" */
public class Test { public class Test {
public static void main (String args[]) { public static void main (String args[]) {
System.exit (0); System.exit (0);

@ -1 +1 @@
Subproject commit d9602e794938a59c69e694e4a65d98b885906471 Subproject commit 669eb7e7932b2faf9d85c8b4761f8a55f029bbeb