diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2017-09-27 23:10:29 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2017-09-27 23:10:29 +0200 |
| commit | 41b427e1b220389eccd65e436fc3452e2bc0215d (patch) | |
| tree | 431584749084f7b041d406153cfcf1ad1f043737 /configure.ac | |
| parent | c0a6eb14c257a47e9573631e5ac09e6528fba377 (diff) | |
| download | mcron-41b427e1b220389eccd65e436fc3452e2bc0215d.tar.gz mcron-41b427e1b220389eccd65e436fc3452e2bc0215d.tar.bz2 mcron-41b427e1b220389eccd65e436fc3452e2bc0215d.zip | |
Revert "Taken on board suggestions of Mathieu Lirzin as per e-mails to the bug-mcron@gnu.org mailing list around September 2015."
This reverts commit c0a6eb14c257a47e9573631e5ac09e6528fba377.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 149653d..a3b84e6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,8 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 2003, 2005, 2012, 2014, 2015 Dale Mellor +# Copyright (C) 2003, 2005, 2012, 2014 Dale Mellor +# Copyright (C) 2015 Mathieu Lirzin # # This file is part of GNU mcron. # @@ -23,13 +24,8 @@ AC_PREREQ(2.61) AC_INIT([GNU Mcron], [1.0.8], [bug-mcron@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([silent-rules]) +AM_INIT_AUTOMAKE -# Enable silent rules by default. -AM_SILENT_RULES([yes]) - -guilemoduledir="${datarootdir}/guile/site/2.0" -AC_SUBST([guilemoduledir]) AC_MSG_CHECKING([whether debugging is requested]) AC_ARG_ENABLE(debug, @@ -49,19 +45,12 @@ AC_SUBST(CONFIG_DEBUG) # We have no interest (hence a no-op), but Debian wants this. AC_ARG_ENABLE(maintainer-mode) -AC_CANONICAL_HOST + AC_PROG_AWK AC_PROG_EGREP AM_PROG_CC_C_O -PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7]) -AC_PATH_PROG([GUILE], [guile]) - -# search guild -AC_PATH_PROG([GUILD], [guild]) -if test "x$GUILD" = "x"; then - AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) -fi +PKG_CHECK_MODULES(GUILE, guile-2.0) # Checks for programs. @@ -75,6 +64,10 @@ AC_CHECK_PROGS(HEAD, head) if test "x$ac_cv_prog_HEAD" = "x"; then AC_MSG_ERROR(head not found) fi +AC_CHECK_PROGS(ED, ed) +if test "x$ac_cv_prog_ED" = "x"; then + AC_MSG_ERROR(ed not found) +fi AC_CHECK_PROGS(WHICH, which) if test "x$ac_cv_prog_WHICH" = "x"; then AC_MSG_ERROR(which not found) |