forked from lix-project/hydra
Capture the path to `guile', when available.
This commit is contained in:
parent
f27ae1d566
commit
183078131a
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -15,3 +15,4 @@ Makefile.in
|
|||
/aclocal.m4
|
||||
/missing
|
||||
/install-sh
|
||||
/src/script/hydra-eval-guile-jobs
|
||||
|
|
11
configure.ac
11
configure.ac
|
@ -77,6 +77,13 @@ LIBS="$old_LIBS"
|
|||
PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
|
||||
PKG_CHECK_MODULES([GUILE], [guile-2.0], [HAVE_GUILE=yes], [HAVE_GUILE=no])
|
||||
|
||||
if test "x$HAVE_GUILE" = xyes; then
|
||||
AC_PATH_PROG([GUILE], [guile])
|
||||
else
|
||||
GUILE="guile"
|
||||
fi
|
||||
AC_SUBST([GUILE])
|
||||
|
||||
testPath="$(dirname $(type -p expr))"
|
||||
AC_SUBST(testPath)
|
||||
|
||||
|
@ -91,8 +98,12 @@ AC_CONFIG_FILES([
|
|||
src/lib/Makefile
|
||||
src/root/Makefile
|
||||
src/script/Makefile
|
||||
src/script/hydra-eval-guile-jobs
|
||||
tests/Makefile
|
||||
tests/jobs/config.nix
|
||||
])
|
||||
|
||||
AC_CONFIG_COMMANDS([executable-scripts],
|
||||
[chmod +x src/script/hydra-eval-guile-jobs])
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -1,15 +1,19 @@
|
|||
EXTRA_DIST = \
|
||||
$(distributable_scripts) \
|
||||
hydra-control \
|
||||
$(bin_SCRIPTS)
|
||||
hydra-eval-guile-jobs.in
|
||||
|
||||
bin_SCRIPTS = \
|
||||
distributable_scripts = \
|
||||
hydra-init \
|
||||
hydra-build \
|
||||
hydra-evaluator \
|
||||
hydra-eval-guile-jobs \
|
||||
hydra-queue-runner \
|
||||
hydra-server \
|
||||
hydra-update-gc-roots \
|
||||
nix-prefetch-git \
|
||||
nix-prefetch-bzr \
|
||||
nix-prefetch-hg
|
||||
|
||||
bin_SCRIPTS = \
|
||||
$(distributable_scripts) \
|
||||
hydra-eval-guile-jobs
|
||||
|
|
2
src/script/hydra-eval-guile-jobs → src/script/hydra-eval-guile-jobs.in
Executable file → Normal file
2
src/script/hydra-eval-guile-jobs → src/script/hydra-eval-guile-jobs.in
Executable file → Normal file
|
@ -8,7 +8,7 @@ main="(module-ref (resolve-interface '(hydra-eval-guile-jobs)) 'eval-guile-jobs)
|
|||
unset GUILE_LOAD_PATH
|
||||
unset GUILE_LOAD_COMPILED_PATH
|
||||
|
||||
exec ${GUILE:-guile} --no-auto-compile \
|
||||
exec ${GUILE:-@GUILE@} --no-auto-compile \
|
||||
-l "$0" -c "(apply $main (cdr (command-line)))" "$@"
|
||||
!#
|
||||
;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
|
Loading…
Reference in a new issue