[gnunet-scheme] 06/12: Eliminate '--with-guile-site-dir' hack.

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

commit 4562c5bd0fa029970b9930c8ce2c6e37f7da876a
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Thu Feb 3 16:51:20 2022 +0000

    Eliminate '--with-guile-site-dir' hack.
    
    * configure.ac: Explicitely call AC_CANONICAL_HOST.  Ignore GUILE_SITE
      and GUILE_SITE_CCACHE.  Don't call GUILE_SITE_DIR or GUILE_FLAGS.
    * guix.scm (scheme-gnunet)[arguments]: Remove.
---
 configure.ac | 14 +++++++-------
 guix.scm     |  5 -----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5f3f024..68da293 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 # Copyright (C) 2000-2012, 2016, 2019 Free Software Foundation, Inc.
-# Copyright (C) 2020, 2021 GNUnet e.V.
+# Copyright (C) 2020-2022 GNUnet e.V.
 #
 # Author (GnuTLS): Nikos Mavrogiannopoulos, Simon Josefsson
 # Author (scheme-GNUnet): Maxime Devos
@@ -30,18 +30,20 @@ AC_CONFIG_MACRO_DIRS([m4])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 
+AC_CANONICAL_HOST
 AC_MSG_RESULT([***
 *** Checking for compilation programs...
 ])
 dnl Checks for programs.
 #PKG_PROG_PKG_CONFIG
 
+# Don't use $(GUILE_SITE) and $(GUILE_SITE_CCACHE), that doesn't work on Guix 
and Nix and the like.
 AC_ARG_WITH([guile-site-dir], AS_HELP_STRING([--with-guile-site-dir=DIR],
-    [guile site directory for scheme-gnunet, default is guile system 
settings]),
-    [guilesitedir="${withval}"], [guilesitedir='$(GUILE_SITE)'])
+    [guile site directory for scheme-gnunet]),
+    [guilesitedir="${withval}"], 
[guilesitedir='$(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)'])
 AC_ARG_WITH([guile-site-ccache-dir], 
AS_HELP_STRING([--with-guile-site-ccache-dir=DIR],
-    [guile ccache directory for scheme-gnunet, default is guile system 
settings]),
-    [guilesiteccachedir="${withval}"], 
[guilesiteccachedir='$(GUILE_SITE_CCACHE)'])
+    [guile ccache directory for scheme-gnunet]),
+    [guilesiteccachedir="${withval}"], 
[guilesiteccachedir='$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache'])
 AC_SUBST([guilesitedir])
 AC_SUBST([guilesiteccachedir])
 
@@ -53,8 +55,6 @@ AC_SUBST([GUILD])
 dnl TODO check if 2.x works
 GUILE_PKG([3.0 2.2 2.0])
 GUILE_PROGS
-GUILE_SITE_DIR
-GUILE_FLAGS
 
 AM_CONDITIONAL([HAVE_GUILD], [test "x$GUILD" != "x"])
 
diff --git a/guix.scm b/guix.scm
index 8fde324..dd58a41 100644
--- a/guix.scm
+++ b/guix.scm
@@ -83,11 +83,6 @@
                       #:recursive? #t
                       #:select? (git-predicate %source-dir)))
    (build-system gnu-build-system)
-   (arguments
-    '(#:configure-flags
-      (list
-       
"--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)"
-       
"--with-guile-site-ccache-dir=$(libdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)/site-ccache")))
    (propagated-inputs
     (list guile-zlib guile-bytestructures guile-fibers/patched guile-gcrypt
          guile-json-4 guile-pfds))

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.