improvements in packages

This commit is contained in:
Vitor Santos Costa 2014-10-02 23:24:31 +01:00
parent 56a1e11656
commit 2c599d99f8
3 changed files with 56 additions and 12 deletions

64
configure vendored
View File

@ -13489,7 +13489,7 @@ if test "$yap_cv_R" != "no" -a -e "$srcdir"/packages/real/Makefile.in; then
if test "$host" = "$build"
if test "$host" != "$build" -a "$yap_cv_R" != "yes"
then
REAL_TARGET="ritf"
REAL_INCLUDES=-I"$yap_cv_R"/include
@ -13505,7 +13505,53 @@ then
;;
esac
else
for ac_prog in R.exe R
if test "$yap_cv_R" = "yes"
then
for ac_prog in R.exe R r
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_REXE+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$REXE"; then
ac_cv_prog_REXE="$REXE" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_REXE="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
REXE=$ac_cv_prog_REXE
if test -n "$REXE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $REXE" >&5
$as_echo "$REXE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$REXE" && break
done
test -n "$REXE" || REXE=""none""
else
for ac_prog in R.exe R r
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@ -13549,7 +13595,8 @@ fi
done
test -n "$REXE" || REXE=""none""
if test $REXE = none; then
fi
if test "$REXE" = none -o x"$REXE" = "x"; then
REAL_TARGET="dummy"
else
REAL_TARGET="ritf"
@ -13701,9 +13748,6 @@ esac
if test "x$JAVACFLAGS" = x; then
JAVACFLAGS="-source 1.4 -target 1.4"
fi
@ -13858,7 +13902,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 13861 "configure" */
/* #line 13905 "configure" */
public class Test {
}
EOF
@ -14034,7 +14078,7 @@ EOF
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
echo "configure: 14037: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: 14081: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
@ -14165,7 +14209,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 14168 "configure" */
/* #line 14212 "configure" */
public class Test {
}
EOF
@ -14200,7 +14244,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
/* [#]line 14203 "configure" */
/* [#]line 14247 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);

@ -1 +1 @@
Subproject commit d8add7b7d10f57ce1b96653799b6a5662e3dc5a9
Subproject commit ef6968e8e2b34db30c6a7e79d7debdfd96989cf7

@ -1 +1 @@
Subproject commit e03b1a3f77169c6c58649b387f8a301320de48af
Subproject commit 31bfeecaf4514e073f94a8994544b0ee96e1f44d