put in tests to see if R is in system so that unit tests can run
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9183 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
dc15f0a6f8
commit
41f0814f91
2 changed files with 29 additions and 1 deletions
|
|
@ -86,7 +86,7 @@ check-aliveness:
|
||||||
@$(skip-csharp) || ./$(TARGET) -csharp -help
|
@$(skip-csharp) || ./$(TARGET) -csharp -help
|
||||||
@$(skip-modula3) || ./$(TARGET) -modula3 -help
|
@$(skip-modula3) || ./$(TARGET) -modula3 -help
|
||||||
@$(skip-lua) || ./$(TARGET) -lua -help
|
@$(skip-lua) || ./$(TARGET) -lua -help
|
||||||
@$(skip-r) || ./$(TARGET) -lua -help
|
@$(skip-r) || ./$(TARGET) -r -help
|
||||||
|
|
||||||
# Checks examples for compilation (does not run them)
|
# Checks examples for compilation (does not run them)
|
||||||
check-examples: \
|
check-examples: \
|
||||||
|
|
|
||||||
|
|
@ -1723,6 +1723,28 @@ fi
|
||||||
|
|
||||||
AC_SUBST(CLISPBIN)
|
AC_SUBST(CLISPBIN)
|
||||||
|
|
||||||
|
#----------------------------------------------------------------
|
||||||
|
# Look for GNU R
|
||||||
|
#----------------------------------------------------------------
|
||||||
|
|
||||||
|
RBIN=
|
||||||
|
|
||||||
|
AC_ARG_WITH(clisp, AS_HELP_STRING([--without-clisp], [Disable R])
|
||||||
|
AS_HELP_STRING([--with-clisp=path], [Set location of R executable (clisp)]),[ RBIN="$withval"], [RBIN=yes])
|
||||||
|
|
||||||
|
# First, check for "--without-clisp" or "--with-clisp=no".
|
||||||
|
if test x"${RBIN}" = xno -o x"${with_alllang}" = xno ; then
|
||||||
|
AC_MSG_NOTICE([Disabling R])
|
||||||
|
else
|
||||||
|
|
||||||
|
# can we find R?
|
||||||
|
if test "x$RBIN" = xyes; then
|
||||||
|
AC_PATH_PROG(RBIN, R)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(RBIN)
|
||||||
|
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
# Determine which languages to use for examples/test-suite
|
# Determine which languages to use for examples/test-suite
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
|
|
@ -1842,6 +1864,12 @@ if test -z "$CLISPBIN" ; then
|
||||||
fi
|
fi
|
||||||
AC_SUBST(SKIP_CLISP)
|
AC_SUBST(SKIP_CLISP)
|
||||||
|
|
||||||
|
SKIP_R=
|
||||||
|
if test -z "$RBIN" ; then
|
||||||
|
SKIP_R="1"
|
||||||
|
fi
|
||||||
|
AC_SUBST(SKIP_R)
|
||||||
|
|
||||||
SKIP_CFFI=
|
SKIP_CFFI=
|
||||||
#if test -z "$CFFIBIN" ; then
|
#if test -z "$CFFIBIN" ; then
|
||||||
SKIP_CFFI="1"
|
SKIP_CFFI="1"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue