diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2012-06-12 19:05:02 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-07-04 18:26:35 +0200 |
| commit | 84354256bff5e95ed3dd8d42b4d7322044c979d7 (patch) | |
| tree | 351a8973ae6bc494ba7462010978e857e6a15418 /scripts/kconfig | |
| parent | d7c67a2e93334f7d290ba5fc2b2129b9d8ecd84f (diff) | |
| download | lwn-84354256bff5e95ed3dd8d42b4d7322044c979d7.tar.gz lwn-84354256bff5e95ed3dd8d42b4d7322044c979d7.zip | |
kconfig: check ncursesw headers first in check-lxdialog
Commit 8c41e5e363db55d91aa3b1cdce4ab02ad9821de7 added a check for
ncursesw/curses.h for the case where ncurses and ncursesw are build
separately but only one is installed. But if both are installed,
the headers ncurses/curses.h and ncursesw/curses.h differ, and since
libncursesw will be found first, so should ncursesw/curses.h.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/lxdialog/check-lxdialog.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh index 82cc3a85e7f8..b75820bbdd3a 100644 --- a/scripts/kconfig/lxdialog/check-lxdialog.sh +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh @@ -19,12 +19,12 @@ ldflags() # Where is ncurses.h? ccflags() { - if [ -f /usr/include/ncurses/ncurses.h ]; then + 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>"' - elif [ -f /usr/include/ncursesw/curses.h ]; then - echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"' elif [ -f /usr/include/ncurses.h ]; then echo '-DCURSES_LOC="<ncurses.h>"' else |