cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed SCRIPT_SH/SHELL handling.

Browse Source
This commit is contained in:
Frank Warmerdam 2001-04-06 02:53:24 +00:00
parent 8cdf1878b4
commit 61b0ba33f0
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -1,5 +1,5 @@
#! smake #! smake
# $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.19 2001-04-03 05:17:02 warmerda Exp $ # $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.20 2001-04-06 02:53:24 warmerda Exp $
# #
# @WARNING@ # @WARNING@
# #
@ -38,6 +38,7 @@ SRCDIR = @SRCDIR@
# #
@SETMAKE@ @SETMAKE@
SHELL = @SCRIPT_SH@ SHELL = @SCRIPT_SH@
SCRIPT_SH = @SCRIPT_SH@
NULL = NULL =
ECHO = echo ECHO = echo
GENDIST = ${TOOLROOT}/usr/sbin/gendist GENDIST = ${TOOLROOT}/usr/sbin/gendist

19
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.13 2001-04-03 05:17:02 warmerda Exp $ # $Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.14 2001-04-06 02:53:58 warmerda Exp $
# #
# Tag Image File Format (TIFF) Software # Tag Image File Format (TIFF) Software
# #
@ -152,7 +152,7 @@ do
-target|--target) ac_prev=TARGET;; -target|--target) ac_prev=TARGET;;
-target=*|--target=*) TARGET="$ac_optarg" ;; -target=*|--target=*) TARGET="$ac_optarg" ;;
-version|--version) -version|--version)
echo "This is TIFF configure $Revision: 1.13 $" echo "This is TIFF configure $Revision: 1.14 $"
exit 0 exit 0
;; ;;
-help|--help) usage; exit 0;; -help|--help) usage; exit 0;;
@ -634,18 +634,22 @@ EOF
boom boom
fi fi
# Find sh (likely /bin/sh or /usr/bin/sh), and put in SCRIPT_SH
test -z "${SCRIPT_SH-}" && SCRIPT_SH=`findAppDef sh $PATH sh`
# #
# Check whether or not $MAKE automatically sets MAKE # Check whether or not $MAKE automatically sets MAKE
# in the Makefiles. If not, we add an explicit define # in the Makefiles. If not, we add an explicit define
# for places where recursive calls are made. # for places where recursive calls are made.
# #
if [ -z "${SETMAKE-}" ]; then if [ -z "${SETMAKE-}" ]; then
if (cat<<'EOF' if (sed "s;@SHELL@;$SCRIPT_SH;" <<'EOF'
SHELL=/bin/sh SHELL=@SHELL@
all: all:
@if [ -n "${MAKE}" ] ; then echo "make sets make" ; fi @if [ -n "${MAKE}" ] ; then echo "make sets make" ; fi
EOF EOF
) | $MAKE -f - | grep "make sets make" > /dev/null ; then ) | tee out.sh | $MAKE -f - | grep "make sets make" > /dev/null ; then
SETMAKE= SETMAKE=
else else
Note "Looks like $MAKE does not setup MAKE in Makefiles, will compensate." Note "Looks like $MAKE does not setup MAKE in Makefiles, will compensate."
@ -921,7 +925,7 @@ main()
*(buf1 + j) = rand(); *(buf1 + j) = rand();
fd = open("conftestmmap", O_CREAT | O_RDWR, 0666); fd = open("conftestmmap", O_CREAT | O_RDWR, 0666);
write(fd, buf1, i2); write(fd, buf1, i2);
mmap(buf2, i, PROT_READ | PROT_WRITE, MAP_VARIABLE | MAP_PRIVATE, fd, 0); buf2 = mmap(NULL, i, PROT_READ|PROT_WRITE, MAP_VARIABLE|MAP_PRIVATE, fd, 0);
for (j = 0; j < i; ++j) for (j = 0; j < i; ++j)
if (*(buf1 + j) != *(buf2 + j)) if (*(buf1 + j) != *(buf2 + j))
exit(1); exit(1);
@ -1249,7 +1253,6 @@ Note "Selecting programs used during installation."
# #
test -z "${CHMOD-}" && CHMOD=`findAppDef chmod $PATH chmod` test -z "${CHMOD-}" && CHMOD=`findAppDef chmod $PATH chmod`
test -z "${LN-}" && LN=`findAppDef ln $PATH ln` test -z "${LN-}" && LN=`findAppDef ln $PATH ln`
test -z "${SCRIPT_SH-}" && SCRIPT_SH=`findAppDef sh $PATH sh`
test -z "${SED-}" && SED=`findAppDef sed $PATH sed` test -z "${SED-}" && SED=`findAppDef sed $PATH sed`
test -z "${STRIP-}" && STRIP=`findAppDef strip $PATH strip` test -z "${STRIP-}" && STRIP=`findAppDef strip $PATH strip`
@ -1287,7 +1290,7 @@ fi
if [ -z "${INSTALL-}" ]; then if [ -z "${INSTALL-}" ]; then
case $TARGET in case $TARGET in
*-irix*) INSTALL=`findApp install /sbin:$PATH`;; *-irix*) INSTALL=`findApp install /sbin:$PATH`;;
*) INSTALL='${SHELL} ../port/install.sh';; *) INSTALL='${SCRIPT_SH} ../port/install.sh';;
esac esac
fi fi