[svn-r10064] Purpose:

Bug fix

Description:
This checkin addresses two bugs.
Firstly, I used the wrong semantics when detecting if $MAKE is defined to
the empty string or undefined.
Secondly, pmake on IRIX does not work well with automake's dependency tracking
if the build is not an in-place build.

Solution:
Fixed semantics in configure.in.
Disabled automatic dependency tracking automatically on IRIX.  This is not
the optimal fix, but it should work fine as long as no one is doing HDF5
development on IRIX, and it is much easier than trying to detect the exact
situations in which dependency tracking fails (or than trying to fix dependency
tracking!).

Platforms tested:
heping, modi4 (pmake and gmake)
This commit is contained in:
James Laird 2005-02-22 12:42:48 -05:00
parent 7ff30cd695
commit 081ac87fed
4 changed files with 22 additions and 2 deletions

View File

@ -6,6 +6,16 @@
#
# See BlankForm in this directory for details
# Disable dependency tracking on IRIX unless the user specifically asks for
# it.
# IRIX's pmake confuses automake (as of version 1.9) if dependency tracking
# is enabled and it is not an in-place build. Simply disabling dependency
# tracking on IRIX is simpler to implement than detecting pmake, detecting
# when a build is not in-place, and then disabling dependency tracking.
if test -z "${enable_dependency_tracking}"; then
enable_dependency_tracking="no"
fi
# The default compiler is `cc' and there is no ranlib.
if test "X-" = "X-$CC"; then
CC=cc

View File

@ -6,6 +6,16 @@
#
# See BlankForm in this directory for details.
# Disable dependency tracking on IRIX unless the user specifically asks for
# it.
# IRIX's pmake confuses automake (as of version 1.9) if dependency tracking
# is enabled and it is not an in-place build. Simply disabling dependency
# tracking on IRIX is simpler to implement than detecting pmake, detecting
# when a build is not in-place, and then disabling dependency tracking.
if test -z "${enable_dependency_tracking}"; then
enable_dependency_tracking="no"
fi
# Use SGI supplied C compiler by default. There is no ranlib
if test "X-" = "X-$CC"; then
CC='cc'

2
configure vendored
View File

@ -9732,7 +9732,7 @@ rm maketest
AM_MAKEFLAGS=""
if test ${MAKE}; then
if test -n "${MAKE-make}"; then
echo "$as_me:$LINENO: checking whether make will build with undefined variables" >&5
echo $ECHO_N "checking whether make will build with undefined variables... $ECHO_C" >&6

View File

@ -566,7 +566,7 @@ dnl
AC_SUBST(AM_MAKEFLAGS) AM_MAKEFLAGS=""
dnl Don't run test if MAKE is defined but is the empty string
if test ${MAKE}; then
if test -n "${MAKE-make}"; then
AC_MSG_CHECKING([whether make will build with undefined variables])