Skip to content

Commit

Permalink
Specify a julia binary instead of a julia prefix
Browse files Browse the repository at this point in the history
and let julia collect the information about all other paths
  • Loading branch information
sebasguts committed Jan 28, 2019
1 parent e97e61e commit c8a4088
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -458,13 +458,12 @@ AC_SUBST([READLINE_LIBS])
dnl Find julia
AC_ARG_WITH([julia],
[AS_HELP_STRING([--with-julia@<:@=PREFIX@:>@],
[specify a prefix where julia can be found])],
[specify a julia binary])],
[],[with_julia=no]
)

AS_IF([test "x$with_julia" != xno],[
AC_PATH_PROG([JULIA], [julia], [], [${with_julia}/bin ${PATH}])
AS_IF([test "x$JULIA" = x],[ AC_MSG_ERROR([no julia executable found]) ])
JULIA="${with_julia}"
JL_SHARE=$($JULIA --startup-file=no -e 'print(joinpath(Sys.BINDIR, Base.DATAROOTDIR, "julia"))')
AS_IF([test -f "${JL_SHARE}/julia-config.jl"], [], [AC_MSG_ERROR([no julia-config.jl found])])
Expand Down
2 changes: 1 addition & 1 deletion etc/ci-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ then
cd julia-*
JULIA_PATH=$(pwd)
popd
CONFIGFLAGS="--with-gc=julia --with-julia=$JULIA_PATH $CONFIGFLAGS"
CONFIGFLAGS="--with-gc=julia --with-julia=${JULIA_PATH}/bin/julia $CONFIGFLAGS"
fi


Expand Down

0 comments on commit c8a4088

Please sign in to comment.