Capture the path to `guile', when available.

This commit is contained in:
Ludovic Courtès 2012-08-18 23:47:43 +02:00
parent f27ae1d566
commit 183078131a
4 changed files with 30 additions and 14 deletions

1
.gitignore vendored
View file

@ -15,3 +15,4 @@ Makefile.in
/aclocal.m4 /aclocal.m4
/missing /missing
/install-sh /install-sh
/src/script/hydra-eval-guile-jobs

View file

@ -77,6 +77,13 @@ LIBS="$old_LIBS"
PKG_CHECK_MODULES([BDW_GC], [bdw-gc]) PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
PKG_CHECK_MODULES([GUILE], [guile-2.0], [HAVE_GUILE=yes], [HAVE_GUILE=no]) 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))" testPath="$(dirname $(type -p expr))"
AC_SUBST(testPath) AC_SUBST(testPath)
@ -91,8 +98,12 @@ AC_CONFIG_FILES([
src/lib/Makefile src/lib/Makefile
src/root/Makefile src/root/Makefile
src/script/Makefile src/script/Makefile
src/script/hydra-eval-guile-jobs
tests/Makefile tests/Makefile
tests/jobs/config.nix tests/jobs/config.nix
]) ])
AC_CONFIG_COMMANDS([executable-scripts],
[chmod +x src/script/hydra-eval-guile-jobs])
AC_OUTPUT AC_OUTPUT

View file

@ -1,15 +1,19 @@
EXTRA_DIST = \ EXTRA_DIST = \
hydra-control \ $(distributable_scripts) \
$(bin_SCRIPTS) hydra-control \
hydra-eval-guile-jobs.in
bin_SCRIPTS = \ distributable_scripts = \
hydra-init \ hydra-init \
hydra-build \ hydra-build \
hydra-evaluator \ hydra-evaluator \
hydra-eval-guile-jobs \ hydra-queue-runner \
hydra-queue-runner \ hydra-server \
hydra-server \ hydra-update-gc-roots \
hydra-update-gc-roots \ nix-prefetch-git \
nix-prefetch-git \ nix-prefetch-bzr \
nix-prefetch-bzr \
nix-prefetch-hg nix-prefetch-hg
bin_SCRIPTS = \
$(distributable_scripts) \
hydra-eval-guile-jobs

View file

@ -8,7 +8,7 @@ main="(module-ref (resolve-interface '(hydra-eval-guile-jobs)) 'eval-guile-jobs)
unset GUILE_LOAD_PATH unset GUILE_LOAD_PATH
unset GUILE_LOAD_COMPILED_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)))" "$@" -l "$0" -c "(apply $main (cdr (command-line)))" "$@"
!# !#
;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org> ;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>