Use $DJDIR rather than $DJGPP to detect running on DJGPP. * automake.in (Language): Use $ENV{'DJDIR'} for the $ENV{'SHELL'} override. * bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix bootstrapping under MinGW when $DJGPP has been set. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>