On Tue, Nov 5, 2019 at 5:47 AM Alyssa Ross <hi@xxxxxxxxx> wrote: > > If ncurses is installed, but at a non-default location, the previous > error message was not helpful in resolving the situation. Now, if > ncurses can't be found, and pkg-config is not installed, it will > suggest that pkg-config might need to be installed in addition to > ncurses. > > Signed-off-by: Alyssa Ross <hi@xxxxxxxxx> > --- I do not like to complicate the error message. How about appending a little more info, like this? * * Unable to find the ncurses package. * Install ncurses (ncurses-devel or libncurses-dev * depending on your distribution). * * You may also need to install pkg-config to find the * ncurses installed in a non-default location. * Thanks. > scripts/kconfig/mconf-cfg.sh | 14 ++++++++++++-- > scripts/kconfig/nconf-cfg.sh | 14 ++++++++++++-- > 2 files changed, 24 insertions(+), 4 deletions(-) > > diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh > index c812872d7f9d..f547b13f77f6 100755 > --- a/scripts/kconfig/mconf-cfg.sh > +++ b/scripts/kconfig/mconf-cfg.sh > @@ -41,7 +41,17 @@ fi > > echo >&2 "*" > echo >&2 "* Unable to find the ncurses package." > -echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev" > -echo >&2 "* depending on your distribution)." > +echo >&2 "*" > +if [ -n "$(command -v pkg-config)" ]; then > + echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev" > + echo >&2 "* depending on your distribution)." > +else > + echo >&2 "* You may need to install ncurses" > + echo >&2 "* (ncurses-devel or libncurses-dev" > + echo >&2 "* depending on your distribution)." > + echo >&2 "*" > + echo >&2 "* If you have ncurses installed," > + echo >&2 "* you may also need to install pkg-config." > +fi > echo >&2 "*" > exit 1 > diff --git a/scripts/kconfig/nconf-cfg.sh b/scripts/kconfig/nconf-cfg.sh > index 001559ef0a60..569226f1b497 100755 > --- a/scripts/kconfig/nconf-cfg.sh > +++ b/scripts/kconfig/nconf-cfg.sh > @@ -41,7 +41,17 @@ fi > > echo >&2 "*" > echo >&2 "* Unable to find the ncurses package." > -echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev" > -echo >&2 "* depending on your distribution)." > +echo >&2 "*" > +if [ -n "$(command -v pkg-config)" ]; then > + echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev" > + echo >&2 "* depending on your distribution)." > +else > + echo >&2 "* You may need to install ncurses" > + echo >&2 "* (ncurses-devel or libncurses-dev" > + echo >&2 "* depending on your distribution)." > + echo >&2 "*" > + echo >&2 "* If you have ncurses installed," > + echo >&2 "* you may also need to install pkg-config." > +fi > echo >&2 "*" > exit 1 > -- > 2.23.0 > -- Best Regards Masahiro Yamada
