[no subject]

[Ludovic Courtès]

branch: wip-actors
commit e4233a94ea5cd192bd130cc397ac94986da70617
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Sep 1 23:17:48 2023 +0200

    config: Define '%runstatedir'.
    
    * configure.ac: Require 2.71.
    * Makefile.am (do_subst): Substitute $(runstatedir).
    * src/cuirass/config.scm.in (%runstatedir): New variable.
    * src/cuirass/base.scm (%cuirass-run-state-directory): New variable.
    * guix.scm <native-inputs>: Use AUTOCONF-2.71.
---
 Makefile.am                        | 17 +++++++++--------
 build-aux/guix/cuirass-package.scm |  2 +-
 configure.ac                       |  2 +-
 src/cuirass/base.scm               |  6 ++++++
 src/cuirass/config.scm.in          |  5 +++++
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bb72285..d8ed3f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-# Copyright © 1995-2016 Free Software Foundation, Inc.
+# Copyright © 1995-2016, 2023 Free Software Foundation, Inc.
 # Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
 # Copyright © 2018, 2023 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2018 Clément Lassieur <clement@lassieur.org>
@@ -224,13 +224,14 @@ dist-hook:
 # Use config.status to substitute the remainder where a single expansion is
 # sufficient.  We use a funny notation here to avoid configure substitutions
 # in our text.
-do_subst = ( $(SED) \
-  -e "s,@configure_input[@],Generated from $$in.  Do not edit by hand.,g" \
-  -e 's,@datadir[@],$(datadir),g' \
-  -e 's,@GUILE[@],$(GUILE),g' \
-  -e 's,@localstatedir[@],$(localstatedir),g' \
-  -e 's,@PACKAGE_LOAD_COMPILED_PATH[@],$(guileobjectdir),g' \
-  -e 's,@PACKAGE_LOAD_PATH[@],$(guilesitedir),g' \
+do_subst = ( $(SED)                                                            
\
+  -e "s,@configure_input[@],Generated from $$in.  Do not edit by hand.,g"      
\
+  -e 's,@datadir[@],$(datadir),g'                                              
\
+  -e 's,@GUILE[@],$(GUILE),g'                                                  
\
+  -e 's,@localstatedir[@],$(localstatedir),g'                                  
\
+  -e 's,@runstatedir[@],$(runstatedir),g'                                      
\
+  -e 's,@PACKAGE_LOAD_COMPILED_PATH[@],$(guileobjectdir),g'                    
\
+  -e 's,@PACKAGE_LOAD_PATH[@],$(guilesitedir),g'                               
\
   | $(SHELL) ./config.status --file=- )
 
 # Generic instructions to perform the substitution.  Generated files shouldn't
diff --git a/build-aux/guix/cuirass-package.scm 
b/build-aux/guix/cuirass-package.scm
index 0a80dfb..9927a82 100644
--- a/build-aux/guix/cuirass-package.scm
+++ b/build-aux/guix/cuirass-package.scm
@@ -130,7 +130,7 @@
 
            guix))
     (native-inputs
-     (list autoconf automake pkg-config texinfo ephemeralpg))
+     (list autoconf-2.71 automake pkg-config texinfo ephemeralpg))
     (native-search-paths
      ;; For HTTPS access, Cuirass itself honors these variables, with the
      ;; same semantics as Git and OpenSSL (respectively).
diff --git a/configure.ac b/configure.ac
index 3bd829a..886f5a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Cuirass.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.71])
 AC_INIT([Cuirass],
   m4_esyscmd([build-aux/git-version-gen .tarball-version]),
   [bug-guix@gnu.org], [cuirass],
diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index 206326e..6490aad 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -218,6 +218,12 @@ context."
   (make-parameter (or (getenv "CUIRASS_STATE_DIRECTORY")
                       %localstatedir)))
 
+(define %cuirass-run-state-directory
+  ;; Directory where state files with the same lifetime as the process are
+  ;; stored, usually "/var/run".
+  (make-parameter (or (getenv "CUIRASS_RUN_STATE_DIRECTORY")
+                      (string-append (%cuirass-state-directory) "/run"))))
+
 (define (evaluation-log-file eval-id)
   "Return the name of the file containing the output of evaluation EVAL-ID."
   (string-append (%cuirass-state-directory)
diff --git a/src/cuirass/config.scm.in b/src/cuirass/config.scm.in
index 5a1b57b..58ab081 100644
--- a/src/cuirass/config.scm.in
+++ b/src/cuirass/config.scm.in
@@ -56,3 +56,8 @@
   ;; Define to 'PREFIX/var' which is a modifiable single-machine data
   ;; directory.
   "@localstatedir@")
+
+(define-public %runstatedir
+  ;; Define to 'PREFIX/run' which is a modifiable single-machine data
+  ;; directory.
+  "@runstatedir@")