~ruther/guix-local

875715cabfeb7816cea16269cfbdbad08442a73e — Manolis Ragkousis 9 years ago a12f6f4
build: Remove unneeded conditionals for (guix build syscalls).

* m4/guix.m4: Remove 'GUIX_CHECK_LIBC_MOUNT'.
* configure.ac: Remove 'BUILD_SYSCALLS_MODULE'.
* Makefile.am (MODULES): Add 'guix/build/syscalls.scm'.
  (EXTRA_DIST): Remove conditional on BUILD_SYSCALLS_MODULE.
3 files changed, 1 insertions(+), 32 deletions(-)

M Makefile.am
M configure.ac
M m4/guix.m4
M Makefile.am => Makefile.am +1 -14
@@ 101,6 101,7 @@ MODULES =					\
  guix/build/rpath.scm				\
  guix/build/cvs.scm				\
  guix/build/svn.scm				\
  guix/build/syscalls.scm                       \
  guix/build/gremlin.scm			\
  guix/build/emacs-utils.scm			\
  guix/build/graft.scm				\


@@ 157,13 158,6 @@ MODULES +=					\

endif

if BUILD_SYSCALLS_MODULE

MODULES +=					\
  guix/build/syscalls.scm

endif

if BUILD_DAEMON_OFFLOAD

MODULES +=					\


@@ 384,13 378,6 @@ EXTRA_DIST +=					\

endif !BUILD_DAEMON_OFFLOAD

if !BUILD_SYSCALLS_MODULE

EXTRA_DIST +=					\
  guix/build/syscalls.scm

endif !BUILD_SYSCALLS_MODULE


CLEANFILES =					\
  $(GOBJECTS)					\

M configure.ac => configure.ac +0 -5
@@ 86,11 86,6 @@ dnl Check whether (srfi srfi-37) works, and provide our own if it doesn't.
GUIX_CHECK_SRFI_37
AM_CONDITIONAL([INSTALL_SRFI_37], [test "x$ac_cv_guix_srfi_37_broken" = xyes])

dnl Check whether (guix build syscalls) can be built.
GUIX_CHECK_LIBC_MOUNT
AM_CONDITIONAL([BUILD_SYSCALLS_MODULE],
  [test "x$guix_cv_libc_has_mount" = "xyes"])

dnl Decompressors, for use by the substituter and other modules.
AC_PATH_PROG([GZIP], [gzip])
AC_PATH_PROG([BZIP2], [bzip2])

M m4/guix.m4 => m4/guix.m4 +0 -13
@@ 280,19 280,6 @@ AC_DEFUN([GUIX_ASSERT_CXX11], [
  fi
])

dnl GUIX_CHECK_LIBC_MOUNT
dnl
dnl Check whether libc provides 'mount'.  On GNU/Hurd it doesn't (yet).
AC_DEFUN([GUIX_CHECK_LIBC_MOUNT], [
  AC_CACHE_CHECK([whether libc provides 'mount'], [guix_cv_libc_has_mount],
    [GUILE_CHECK([retval], [(dynamic-func \"mount\" (dynamic-link))])
     if test "$retval" = 0; then
       guix_cv_libc_has_mount="yes"
     else
       guix_cv_libc_has_mount="no"
     fi])
])

dnl GUIX_LIBGCRYPT_LIBDIR VAR
dnl
dnl Attempt to determine libgcrypt's LIBDIR; store the result in VAR.