diff options
| author | Artyom V. Poptsov <poptsov.artyom@gmail.com> | 2017-05-09 21:22:52 +0300 |
|---|---|---|
| committer | Artyom V. Poptsov <poptsov.artyom@gmail.com> | 2017-05-09 21:22:52 +0300 |
| commit | 28e0ee3591f8f1248109cc43f0b4a4effd0cb712 (patch) | |
| tree | b5f7e1de2c7fbaf5ea0b8e1022dbd68aec5f0277 | |
| parent | README (Requirements): Update (diff) | |
| download | guile-ssh-28e0ee3591f8f1248109cc43f0b4a4effd0cb712.tar.gz | |
configure.ac: Bugfix: Don't make symlinks to 'sssh{,d}.scm'
The building process would always fail on fresh source tree because
'configure' tried to make a symlink or a copy of files that were not
present yet. This patch fixes the building process.
Reported by Ludovic Courtès, on #guix IRC channel.
* configure.ac: Don't make symlinks to 'sssh.scm' and 'ssshd.scm'.
* examples/Makefile.am: Consider 'sssh.scm' and 'ssshd.scm' as generated
scripts to ensure that they are present in the build directory so
'sssh-ssshd.scm' test suite will not fail.
* NEWS: Update.
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | examples/Makefile.am | 18 |
3 files changed, 24 insertions, 7 deletions
@@ -7,6 +7,14 @@ Copyright (C) Artyom V. Poptsov <poptsov.artyom@gmail.com> are permitted in any medium without royalty provided the copyright notice and this notice are preserved. +* Unreleased +** Bugfixes +*** Fix building scripts + The building process would always fail on fresh source tree because + 'configure' tried to make a symlink or a copy of files that were not + present yet. This should be fixed by now. + + Reported by Ludovic Courtès, on #guix IRC channel. * Changes in version 0.11.0 (2017-05-09) ** Add support of Guile 2.2 Tested with GNU Guile version 2.0.14 (on Gentoo GNU/Linux) and diff --git a/configure.ac b/configure.ac index e926a01..58ae623 100644 --- a/configure.ac +++ b/configure.ac @@ -91,11 +91,6 @@ AC_SUBST(LIBGUILE_SSH_INTERFACE) GUILE_EFFECTIVE_VERSION=`$GUILE -c '(display (effective-version))'` AC_SUBST(GUILE_EFFECTIVE_VERSION) -dnl We need example programs for 'ssssh-ssshd.scm' test suite so they must be -dnl present in the build directory. -AC_CONFIG_LINKS([examples/ssshd.scm:examples/ssshd.scm]) -AC_CONFIG_LINKS([examples/sssh.scm:examples/sssh.scm]) - AC_CONFIG_FILES([Makefile libguile-ssh/Makefile examples/Makefile build-aux/Makefile]) AC_CONFIG_FILES([m4/Makefile doc/Makefile tests/Makefile am/Makefile]) AC_CONFIG_FILES([modules/Makefile modules/ssh/Makefile modules/ssh/dist/Makefile]) diff --git a/examples/Makefile.am b/examples/Makefile.am index ba1d1e6..1ca4282 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -16,6 +16,10 @@ ## along with libguile-ssh. If not, see ## <http://www.gnu.org/licenses/>. +bin_SCRIPTS = sssh.scm ssshd.scm +sssh_scm_SOURCES = sssh.scm.in +ssshd_scm_SOURCES = ssshd.scm.in + EXTRA_DIST = \ sssh.scm.in \ ssshd.scm.in \ @@ -28,10 +32,20 @@ EXTRA_DIST = \ pg-tunnel.scm.in \ uptop.scm.in +SOURCES = \ + echo/server.scm.in \ + echo/client.scm.in \ + rrepl.scm.in \ + rpc/client.scm.in \ + rpc/server.scm.in \ + sscp.scm.in \ + pg-tunnel.scm.in \ + uptop.scm.in + examplesdir = $(pkgdatadir)/examples examples_echodir = $(pkgdatadir)/examples/echo examples_rpcdir = $(pkgdatadir)/examples/rpc -dist_examples_DATA = README sssh.scm ssshd.scm rrepl.scm sscp.scm pg-tunnel.scm \ +dist_examples_DATA = README rrepl.scm sscp.scm pg-tunnel.scm \ uptop.scm dist_examples_echo_DATA = echo/server.scm echo/client.scm dist_examples_rpc_DATA = rpc/client.scm rpc/server.scm @@ -47,7 +61,7 @@ SUFFIXES = .in mv "$@.tmp" "$@" CLEANFILES = \ - sssh.scm ssshd.scm \ + $(bin_SCRIPTS) \ echo/server.scm echo/client.scm \ rrepl.scm \ rpc/server.scm rpc/client.scm \ |