artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Resurrect --with-cheating.

Browse source 
* build-aux/config.sh.in (SCHEME): New substitute.
* build-aux/config.make.in: Likewise.
* configure: Substitute them.
This commit is contained in:
Jan Nieuwenhuizen 2019-07-20 18:56:58 +02:00
parent 3970a8797b
commit 2e98d03699
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build-aux/config.make.in
View file

@ -29,11 +29,8 @@ GUILE_EFFECTIVE_VERSION:=@GUILE_EFFECTIVE_VERSION@
GUIX:=@GUIX@ GUIX:=@GUIX@
HELP2MAN:=@HELP2MAN@ HELP2MAN:=@HELP2MAN@
HEX2:=@HEX2@ HEX2:=@HEX2@
#HEX2FLAGS:=@HEX2FLAGS@
MAKEINFO:=@MAKEINFO@ MAKEINFO:=@MAKEINFO@
M1:=@M1@ M1:=@M1@
#M1FLAGS:=@M1FLAGS@
MES:=@MES@
MES_FOR_BUILD:=@MES_FOR_BUILD@ MES_FOR_BUILD:=@MES_FOR_BUILD@
MES_SEED:=@MES_SEED@ MES_SEED:=@MES_SEED@
NYACC:=@NYACC@ NYACC:=@NYACC@
@ -41,8 +38,8 @@ PACKAGE:=@PACKAGE@
PACKAGE_NAME:=@PACKAGE_NAME@ PACKAGE_NAME:=@PACKAGE_NAME@
PACKAGE_BUGREPORT:=@PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT:=@PACKAGE_BUGREPORT@
PERL:=@PERL@ PERL:=@PERL@
SCHEME:=@SCHEME@
SHELL:=@SHELL@ SHELL:=@SHELL@
TINYCC_PREFIX:=@TINYCC_PREFIX@
VERSION:=@VERSION@ VERSION:=@VERSION@
V:=@V@ V:=@V@
colors:=@colors@ colors:=@colors@

3
build-aux/config.sh.in
View file

@ -30,10 +30,8 @@ GUILE_EFFECTIVE_VERSION="@GUILE_EFFECTIVE_VERSION@"
GUIX="@GUIX@" GUIX="@GUIX@"
HELP2MAN="@HELP2MAN@" HELP2MAN="@HELP2MAN@"
HEX2="@HEX2@" HEX2="@HEX2@"
#HEX2FLAGS="@HEX2FLAGS@"
MAKEINFO="@MAKEINFO@" MAKEINFO="@MAKEINFO@"
M1="@M1@" M1="@M1@"
#M1FLAGS="@M1FLAGS@"
MES_FOR_BUILD="@MES_FOR_BUILD@" MES_FOR_BUILD="@MES_FOR_BUILD@"
MES_SEED="@MES_SEED@" MES_SEED="@MES_SEED@"
NYACC="@NYACC@" NYACC="@NYACC@"
@ -41,6 +39,7 @@ PACKAGE="@PACKAGE@"
PACKAGE_NAME="@PACKAGE_NAME@" PACKAGE_NAME="@PACKAGE_NAME@"
PACKAGE_BUGREPORT="@PACKAGE_BUGREPORT@" PACKAGE_BUGREPORT="@PACKAGE_BUGREPORT@"
PERL="@PERL@" PERL="@PERL@"
#SCHEME="@SCHEME@"
SHELL="@SHELL@" SHELL="@SHELL@"
TINYCC_PREFIX="@TINYCC_PREFIX@" TINYCC_PREFIX="@TINYCC_PREFIX@"
VERSION="@VERSION@" VERSION="@VERSION@"

4
build-aux/export.make
View file

@ -115,6 +115,10 @@ ifdef PERL
export PERL export PERL
endif endif
ifdef SCHEME
export SCHEME
endif
ifdef SHELL ifdef SHELL
export SHELL export SHELL
endif endif

2
configure vendored
View file

@ -598,6 +598,8 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
guile)) guile))
("@MES_SEED@" . ,(or mes-seed "")) ("@MES_SEED@" . ,(or mes-seed ""))
("@PERL@" . ,(or (file-name "perl" deps) "")) ("@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) ("@SHELL@" . ,(or (file-name "bash" deps)
(file-name "sh" deps) (file-name "sh" deps)
"sh")) "sh"))