diogo
/
yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change R configuration.

This commit is contained in:
Vítor Santos Costa 2012-02-06 11:01:10 +00:00
parent 6040696637
commit 73b1a8d6f8
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure vendored
View File

@ -1411,7 +1411,7 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-gmp=DIR use GNU Multiple Precision in DIR --with-gmp=DIR use GNU Multiple Precision in DIR
--with-real=DIR interface to R language --with-R=DIR interface to R language
--enable-minisat use minisat interface --enable-minisat use minisat interface
--with-cudd=DIR use CUDD package in DIR --with-cudd=DIR use CUDD package in DIR
--with-java=JAVA_HOME use Java instalation in JAVA_HOME --with-java=JAVA_HOME use Java instalation in JAVA_HOME
@ -4574,17 +4574,17 @@ fi
# Check whether --with-real was given. # Check whether --with-R was given.
if test "${with_real+set}" = set; then if test "${with_R+set}" = set; then
withval=$with_real; if test "$withval" = yes; then withval=$with_R; if test "$withval" = yes; then
yap_cv_real=yes yap_cv_R=yes
elif test "$withval" = no; then elif test "$withval" = no; then
yap_cv_real=no yap_cv_R=no
else else
yap_cv_real=$with_real yap_cv_R=$with_R
fi fi
else else
yap_cv_real=yes yap_cv_R=yes
fi fi
@ -6687,7 +6687,7 @@ fi
fi fi
if test "$yap_cv_real" = "no"; then if test "$yap_cv_R" = "no"; then
REAL_TARGET="dummy" REAL_TARGET="dummy"
ENABLE_REAL="@# " ENABLE_REAL="@# "
elif test -e "$srcdir"/packages/real/Makefile.in ; then elif test -e "$srcdir"/packages/real/Makefile.in ; then
@ -6736,7 +6736,7 @@ fi
done done
test -n "$REXE" || REXE=""none"" test -n "$REXE" || REXE=""none""
if test "$yap_cv_yapr" != "yes" if test "$yap_cv_R" = "yes"
then then
case "$target_os" in case "$target_os" in
*darwin*) *darwin*)
@ -6773,16 +6773,16 @@ test -n "$REXE" || REXE=""none""
else else
case "$target_os" in case "$target_os" in
*cygwin*|*mingw*) *cygwin*|*mingw*)
REAL_INCLUDES="-I\"$yap_cv_real/include\"" REAL_INCLUDES="-I\"$yap_cv_R/include\""
if test "$YAP_TARGET" = i386; then if test "$YAP_TARGET" = i386; then
REAL_LIBS="\"$yap_cv_real/bin/i386/R.dll\"" REAL_LIBS="\"$yap_cv_R/bin/i386/R.dll\""
else else
REAL_LIBS="\"$yap_cv_real/bin/x64/R.dll\"" REAL_LIBS="\"$yap_cv_R/bin/x64/R.dll\""
fi fi
;; ;;
*) *)
REAL_INCLUDES="-I$yap_cv_real/include" REAL_INCLUDES="-I$yap_cv_R/include"
REAL_LIBS="-L $yap_cv_real/lib -lR" REAL_LIBS="-L $yap_cv_R/lib -lR"
;; ;;
esac esac
fi fi

26
configure.in
View File

@ -232,16 +232,16 @@ AC_ARG_WITH(gmp,
fi, fi,
[yap_cv_gmp=yes]) [yap_cv_gmp=yes])
AC_ARG_WITH(real, AC_ARG_WITH(R,
[ --with-real[=DIR] interface to R language], [ --with-R[=DIR] interface to R language],
if test "$withval" = yes; then if test "$withval" = yes; then
yap_cv_real=yes yap_cv_R=yes
elif test "$withval" = no; then elif test "$withval" = no; then
yap_cv_real=no yap_cv_R=no
else else
yap_cv_real=$with_real yap_cv_R=$with_R
fi, fi,
[yap_cv_real=yes]) [yap_cv_R=yes])
dnl best test we could do. dnl best test we could do.
AC_ARG_WITH(minisat, AC_ARG_WITH(minisat,
@ -736,14 +736,14 @@ then
AC_CHECK_LIB(gmp,main) AC_CHECK_LIB(gmp,main)
fi fi
if test "$yap_cv_real" = "no"; then if test "$yap_cv_R" = "no"; then
REAL_TARGET="dummy" REAL_TARGET="dummy"
ENABLE_REAL="@# " ENABLE_REAL="@# "
elif test -e "$srcdir"/packages/real/Makefile.in ; then elif test -e "$srcdir"/packages/real/Makefile.in ; then
REAL_TARGET="ritf" REAL_TARGET="ritf"
ENABLE_REAL="" ENABLE_REAL=""
AC_CHECK_PROGS(REXE, R, "none") AC_CHECK_PROGS(REXE, R, "none")
if test "$yap_cv_yapr" != "yes" if test "$yap_cv_R" = "yes"
then then
case "$target_os" in case "$target_os" in
*darwin*) *darwin*)
@ -782,16 +782,16 @@ elif test -e "$srcdir"/packages/real/Makefile.in ; then
else else
case "$target_os" in case "$target_os" in
*cygwin*|*mingw*) *cygwin*|*mingw*)
REAL_INCLUDES="-I\"$yap_cv_real/include\"" REAL_INCLUDES="-I\"$yap_cv_R/include\""
if test "$YAP_TARGET" = i386; then if test "$YAP_TARGET" = i386; then
REAL_LIBS="\"$yap_cv_real/bin/i386/R.dll\"" REAL_LIBS="\"$yap_cv_R/bin/i386/R.dll\""
else else
REAL_LIBS="\"$yap_cv_real/bin/x64/R.dll\"" REAL_LIBS="\"$yap_cv_R/bin/x64/R.dll\""
fi fi
;; ;;
*) *)
REAL_INCLUDES="-I$yap_cv_real/include" REAL_INCLUDES="-I$yap_cv_R/include"
REAL_LIBS="-L $yap_cv_real/lib -lR" REAL_LIBS="-L $yap_cv_R/lib -lR"
;; ;;
esac esac
fi fi

2
packages/real

@ -1 +1 @@
Subproject commit 06baa8a9663d092266b174cb9a4628dbc937d253 Subproject commit f4c629b195e560662d211ad11054dda458de4ddb