build: Resurrect --with-cheating.

* build-aux/config.sh.in (SCHEME): New substitute.
* build-aux/config.make.in: Likewise.
* configure: Substitute them.

diff --git a/build-aux/config.make.in b/build-aux/config.make.in
index a511daa202eada70e06abe603bb09901742795ad..45947ef8dfa22b1ea626e8679b275ff8b0b71704 100644 (file)
--- a/build-aux/config.make.in
+++ b/build-aux/config.make.in
@@ -29,11 +29,8 @@ GUILE_EFFECTIVE_VERSION:=@GUILE_EFFECTIVE_VERSION@
 GUIX:=@GUIX@
 HELP2MAN:=@HELP2MAN@
 HEX2:=@HEX2@
 GUIX:=@GUIX@
 HELP2MAN:=@HELP2MAN@
 HEX2:=@HEX2@

-#HEX2FLAGS:=@HEX2FLAGS@

 MAKEINFO:=@MAKEINFO@
 M1:=@M1@
 MAKEINFO:=@MAKEINFO@
 M1:=@M1@

-#M1FLAGS:=@M1FLAGS@
-MES:=@MES@

 MES_FOR_BUILD:=@MES_FOR_BUILD@
 MES_SEED:=@MES_SEED@
 NYACC:=@NYACC@
 MES_FOR_BUILD:=@MES_FOR_BUILD@
 MES_SEED:=@MES_SEED@
 NYACC:=@NYACC@


@@ -41,8 +38,8 @@ PACKAGE:=@PACKAGE@
 PACKAGE_NAME:=@PACKAGE_NAME@
 PACKAGE_BUGREPORT:=@PACKAGE_BUGREPORT@
 PERL:=@PERL@
 PACKAGE_NAME:=@PACKAGE_NAME@
 PACKAGE_BUGREPORT:=@PACKAGE_BUGREPORT@
 PERL:=@PERL@

+SCHEME:=@SCHEME@

 SHELL:=@SHELL@
 SHELL:=@SHELL@

-TINYCC_PREFIX:=@TINYCC_PREFIX@

 VERSION:=@VERSION@
 V:=@V@
 colors:=@colors@
 VERSION:=@VERSION@
 V:=@V@
 colors:=@colors@

diff --git a/build-aux/config.sh.in b/build-aux/config.sh.in
index 0b2bd82203715c67db1b40b142ffc0e07e16d38b..56eccf9490b766831a683c8c091270e0e8a1146e 100644 (file)
--- a/build-aux/config.sh.in
+++ b/build-aux/config.sh.in
@@ -30,10 +30,8 @@ GUILE_EFFECTIVE_VERSION="@GUILE_EFFECTIVE_VERSION@"
 GUIX="@GUIX@"
 HELP2MAN="@HELP2MAN@"
 HEX2="@HEX2@"
 GUIX="@GUIX@"
 HELP2MAN="@HELP2MAN@"
 HEX2="@HEX2@"

-#HEX2FLAGS="@HEX2FLAGS@"

 MAKEINFO="@MAKEINFO@"
 M1="@M1@"
 MAKEINFO="@MAKEINFO@"
 M1="@M1@"

-#M1FLAGS="@M1FLAGS@"

 MES_FOR_BUILD="@MES_FOR_BUILD@"
 MES_SEED="@MES_SEED@"
 NYACC="@NYACC@"
 MES_FOR_BUILD="@MES_FOR_BUILD@"
 MES_SEED="@MES_SEED@"
 NYACC="@NYACC@"


@@ -41,6 +39,7 @@ PACKAGE="@PACKAGE@"
 PACKAGE_NAME="@PACKAGE_NAME@"
 PACKAGE_BUGREPORT="@PACKAGE_BUGREPORT@"
 PERL="@PERL@"
 PACKAGE_NAME="@PACKAGE_NAME@"
 PACKAGE_BUGREPORT="@PACKAGE_BUGREPORT@"
 PERL="@PERL@"

+#SCHEME="@SCHEME@"

 SHELL="@SHELL@"
 TINYCC_PREFIX="@TINYCC_PREFIX@"
 VERSION="@VERSION@"
 SHELL="@SHELL@"
 TINYCC_PREFIX="@TINYCC_PREFIX@"
 VERSION="@VERSION@"

diff --git a/build-aux/export.make b/build-aux/export.make
index ed4394bea3ec2e632b572947d3c826bebfa9b9b4..f3807af729c171616619461fae4efca235e5044d 100644 (file)
--- a/build-aux/export.make
+++ b/build-aux/export.make
@@ -115,6 +115,10 @@ ifdef PERL
 export PERL
 endif
 
 export PERL
 endif
 

+ifdef SCHEME
+export SCHEME
+endif
+

 ifdef SHELL
 export SHELL
 endif
 ifdef SHELL
 export SHELL
 endif

diff --git a/configure b/configure
index 3d85a6c3c8edc99f1297dde7b1051dc9fbbdaa0c..39c00f5c2757d5e60d374107fc52eba5699bb353 100755 (executable)
--- a/configure
+++ b/configure
@@ -598,6 +598,8 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
                                                guile))
                      ("@MES_SEED@" . ,(or mes-seed ""))
                      ("@PERL@" . ,(or (file-name "perl" deps) ""))
                                                guile))
                      ("@MES_SEED@" . ,(or mes-seed ""))
                      ("@PERL@" . ,(or (file-name "perl" deps) ""))

+                     ("#SCHEME=\"@SCHEME@\"" . ,(if with-cheating? (string-append "\nSCHEME=\"" guile "\"") ""))
+                     ("@SCHEME@" . ,(if with-cheating? guile ""))

                      ("@SHELL@" . ,(or (file-name "bash" deps)
                                        (file-name "sh" deps)
                                        "sh"))
                      ("@SHELL@" . ,(or (file-name "bash" deps)
                                        (file-name "sh" deps)
                                        "sh"))