diff options
author | Yann E. MORIN <yann.morin.1998@free.fr> | 2013-03-22 23:12:16 +0100 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2016-04-03 23:59:15 -0400 |
commit | d35ba8b5eddedd50349adf9358574cdbbc3c47ef (patch) | |
tree | 718f9cfbc5cc1f1b17e86d3b1b93e9b241ec5251 /util-linux | |
parent | e62c715b3ebd6fc1d832229ded946d053bd45b94 (diff) | |
download | busybox-d35ba8b5eddedd50349adf9358574cdbbc3c47ef.tar.gz |
kconfig/lxdialog: rationalise the include paths where to find {.n}curses{,w}.h
The current code does this:
if [ -f /usr/include/ncursesw/curses.h ]; then
echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
elif [ -f /usr/include/ncurses/ncurses.h ]; then
echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
elif [ -f /usr/include/ncurses/curses.h ]; then
echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
[...]
This is merely inconsistent:
- adding the full path to the directory in the -I directive,
- especially since that path is already a sub-path of the system
include path,
- and then repeating the sub-path in the #include directive.
Rationalise each include directive:
- only use the filename in the #include directive,
- keep the -I directives: they are always searched for before the
system include path; this ensures the correct header is used.
Using the -I directives and the filename-only in #include is more in
line with how pkg-config behaves, eg.:
$ pkg-config --cflags ncursesw
-I/usr/include/ncursesw
This paves the way for using pkg-config for CFLAGS, too, now we use it
to find the libraries.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'util-linux')
0 files changed, 0 insertions, 0 deletions