diff options
| -rw-r--r-- | config/irix5.x | 10 | ||||
| -rw-r--r-- | config/irix6.x | 10 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/config/irix5.x b/config/irix5.x index 810b221..51b0462 100644 --- a/config/irix5.x +++ b/config/irix5.x @@ -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 diff --git a/config/irix6.x b/config/irix6.x index 1fab241..5d4264b 100644 --- a/config/irix6.x +++ b/config/irix6.x @@ -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' @@ -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 diff --git a/configure.in b/configure.in index 26caaa6..ce8be8a 100644 --- a/configure.in +++ b/configure.in @@ -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]) |