diff options
| author | Dale Mellor <mcron-lsfnyl@rdmp.org> | 2020-06-08 08:45:14 +0100 |
|---|---|---|
| committer | Dale Mellor <mcron-lsfnyl@rdmp.org> | 2020-06-08 08:45:14 +0100 |
| commit | f700f299d41c8f0ecb953f1e02b8fbd432efef3d (patch) | |
| tree | ff6a93826d852a792768bf8139c87fa852ffb514 | |
| parent | bc18db895064d9d0516b784ecac5270282c21d30 (diff) | |
| parent | 289e4c505e52402e5dfba08d57f2ba1d61a90bf3 (diff) | |
| download | mcron-f700f299d41c8f0ecb953f1e02b8fbd432efef3d.tar.gz mcron-f700f299d41c8f0ecb953f1e02b8fbd432efef3d.tar.bz2 mcron-f700f299d41c8f0ecb953f1e02b8fbd432efef3d.zip | |
Merge.
| -rwxr-xr-x | configure.ac | 14 | ||||
| -rw-r--r-- | src/cron.in | 8 | ||||
| -rw-r--r-- | src/crontab.in | 6 | ||||
| -rw-r--r-- | src/mcron.in | 8 |
4 files changed, 22 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index f92619b..97e9cff 100755 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ## Process this file with autoconf to produce a configure script. # # Copyright © 2003, 2005, 2012, 2014 Dale Mellor <mcron-lsfnyl@rdmp.org> -# Copyright © 2015, 2016, 2017, 2018 Mathieu Lirzin <mthl@gnu.org> +# Copyright © 2015, 2016, 2017, 2018, 2020 Mathieu Lirzin <mthl@gnu.org> # Copyright © 2018 宋文武 <iyzsong@member.fsf.org> # # This file is part of GNU Mcron. @@ -33,15 +33,17 @@ AM_SILENT_RULES([yes]) # Enables silent rules by default. AC_CANONICAL_HOST +dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.) +dnl Make sure they are available when generating the configure script. +m4_pattern_forbid([^PKG_PROG]) +m4_pattern_forbid([^PKG_CHECK]) +m4_pattern_forbid([^GUILE_P]) +m4_pattern_allow([^GUILE_PKG_ERRORS]) + # Check for Guile development files. GUILE_PKG([3.0 2.2 2.0]) -# Set Guile flags without using GUILE_FLAGS which is requiring the unused -# 'config.rpath' script. -PKG_CHECK_MODULES(GUILE, [guile-$GUILE_EFFECTIVE_VERSION]) - # Checks for programs. - GUILE_PROGS AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) diff --git a/src/cron.in b/src/cron.in index 97d49b4..25ad273 100644 --- a/src/cron.in +++ b/src/cron.in @@ -2,7 +2,9 @@ -*- scheme -*- !# -(set! %load-path (cons "%modsrcdir%" %load-path)) -(set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path)) -(use-modules (mcron scripts cron)) +(unless (getenv "MCRON_UNINSTALLED") + (set! %load-path (cons "%modsrcdir%" %load-path)) + (set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path))) + +(use-modules (mcron scripts cron)) (main) diff --git a/src/crontab.in b/src/crontab.in index fa31878..dad0dd2 100644 --- a/src/crontab.in +++ b/src/crontab.in @@ -2,6 +2,8 @@ -*- scheme -*- !# -(set! %load-path (cons "%modsrcdir%" %load-path)) -(set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path)) +(unless (getenv "MCRON_UNINSTALLED") + (set! %load-path (cons "%modsrcdir%" %load-path)) + (set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path))) + ((@ (mcron scripts crontab) main)) diff --git a/src/mcron.in b/src/mcron.in index 4519ad0..268743c 100644 --- a/src/mcron.in +++ b/src/mcron.in @@ -2,7 +2,9 @@ -*- scheme -*- !# -(set! %load-path (cons "%modsrcdir%" %load-path)) -(set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path)) -(use-modules (mcron scripts mcron)) +(unless (getenv "MCRON_UNINSTALLED") + (set! %load-path (cons "%modsrcdir%" %load-path)) + (set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path))) + +(use-modules (mcron scripts mcron)) (main) |