Respect CONFIG_SHELL from the environment.
Some large packages using FreeType have to use a broken (deficient) /bin/sh. The configure scripts (as generated by Autoconf) are clever enough to find a better shell and put that one into the environment variable CONFIG_SHELL. If that environment variable is already set the script skips the test and assumes to be already running under a good shell. * builds/unix/detect.mk: Honour CONFIG_SHELL. * builds/unix/unix-def.in (SHELL): Define.
This commit is contained in:
parent
835b9cd586
commit
63463b93bc
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
||||||
|
2013-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||||
|
|
||||||
|
Respect CONFIG_SHELL from the environment.
|
||||||
|
|
||||||
|
Some large packages using FreeType have to use a broken (deficient)
|
||||||
|
/bin/sh. The configure scripts (as generated by Autoconf) are
|
||||||
|
clever enough to find a better shell and put that one into the
|
||||||
|
environment variable CONFIG_SHELL. If that environment variable is
|
||||||
|
already set the script skips the test and assumes to be already
|
||||||
|
running under a good shell.
|
||||||
|
|
||||||
|
* builds/unix/detect.mk: Honour CONFIG_SHELL.
|
||||||
|
* builds/unix/unix-def.in (SHELL): Define.
|
||||||
|
|
||||||
2013-03-21 Werner Lemberg <wl@gnu.org>
|
2013-03-21 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
Fix Savannah patch #7971.
|
Fix Savannah patch #7971.
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
# Copyright 1996-2000, 2002, 2003, 2004, 2006 by
|
# Copyright 1996-2000, 2002-2004, 2006, 2013 by
|
||||||
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
#
|
#
|
||||||
# This file is part of the FreeType project, and may only be used, modified,
|
# This file is part of the FreeType project, and may only be used, modified,
|
||||||
|
@ -76,13 +76,14 @@ ifeq ($(PLATFORM),unix)
|
||||||
|
|
||||||
have_Makefile := $(wildcard $(OBJ_DIR)/Makefile)
|
have_Makefile := $(wildcard $(OBJ_DIR)/Makefile)
|
||||||
|
|
||||||
|
CONFIG_SHELL ?= /bin/sh
|
||||||
setup: std_setup
|
setup: std_setup
|
||||||
ifdef must_configure
|
ifdef must_configure
|
||||||
ifneq ($(have_Makefile),)
|
ifneq ($(have_Makefile),)
|
||||||
# we are building FT2 not in the src tree
|
# we are building FT2 not in the src tree
|
||||||
$(TOP_DIR)/builds/unix/configure $(value CFG)
|
$(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
|
||||||
else
|
else
|
||||||
cd builds/unix; ./configure $(value CFG)
|
cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
# indicate that you have read the license and understand and accept it
|
# indicate that you have read the license and understand and accept it
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
SHELL := @SHELL@
|
||||||
|
|
||||||
TOP_DIR := $(shell cd $(TOP_DIR); pwd)
|
TOP_DIR := $(shell cd $(TOP_DIR); pwd)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue