Skip to content

Commit ec08b3f

Browse files
committed
8256188: Adjust output of make/autoconf/configure
Reviewed-by: clanger, ihse
1 parent da48003 commit ec08b3f

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

make/autoconf/configure

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ export LC_ALL=C
4949
if test "x$CUSTOM_CONFIG_DIR" != x; then
5050
custom_hook=$CUSTOM_CONFIG_DIR/custom-hook.m4
5151
if test ! -e $custom_hook; then
52-
echo "CUSTOM_CONFIG_DIR not pointing to a proper custom config dir."
52+
echo "CUSTOM_CONFIG_DIR ($CUSTOM_CONFIG_DIR) not pointing to a proper custom config dir."
5353
echo "Error: Cannot continue" 1>&2
5454
exit 1
5555
fi
@@ -83,6 +83,7 @@ autoconf_missing_help() {
8383
BREW="`type -p brew 2> /dev/null`"
8484
ZYPPER="`type -p zypper 2> /dev/null`"
8585
CYGWIN="`type -p cygpath 2> /dev/null`"
86+
UNAMEOUT="`uname 2> /dev/null`"
8687

8788
if test "x$ZYPPER" != x; then
8889
PKGHANDLER_COMMAND="sudo zypper install autoconf"
@@ -92,6 +93,8 @@ autoconf_missing_help() {
9293
PKGHANDLER_COMMAND="sudo yum install autoconf"
9394
elif test "x$BREW" != x; then
9495
PKGHANDLER_COMMAND="brew install autoconf"
96+
elif test "x$UNAMEOUT" == xAIX; then
97+
echo "You might be able to fix this by installing autoconf from the 'AIX Toolbox for Linux Applications' (or compile it from the sources)."
9598
elif test "x$CYGWIN" != x; then
9699
PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P autoconf )"
97100
fi
@@ -114,7 +117,7 @@ generate_configure_script() {
114117
AUTOCONF="`type -p autoconf 2> /dev/null`"
115118
if test "x$AUTOCONF" = x; then
116119
echo
117-
echo "Autoconf is not found on the PATH, and AUTOCONF is not set."
120+
echo "Autoconf is not found on the PATH ($PATH), and AUTOCONF is not set."
118121
echo "You need autoconf to be able to generate a runnable configure script."
119122
autoconf_missing_help
120123
echo "Error: Cannot find autoconf" 1>&2

0 commit comments

Comments
 (0)