diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-09 00:27:59 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-09 00:27:59 +0100 |
commit | fadb47884308490085a33d3fb1e857a0f5e5d748 (patch) | |
tree | b78955b59ae121e50753c0d09e5e298c8ccf05cf /scripts/scan-tools.sh | |
parent | 91e7244abc54001dc7b1063cd1b9818d46128bba (diff) | |
parent | a619c16fa72c3c15a198b452e512a08f18251930 (diff) |
resolve conflict
Diffstat (limited to 'scripts/scan-tools.sh')
-rw-r--r-- | scripts/scan-tools.sh | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 743f316b0..56b79663d 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -47,12 +47,7 @@ CYG*) echo 'See http://www.cygwin.com/1.7/cygwin-ug-net/using-specialnames.html' ;; NetBSD) - echo "Building OpenADK on $os is currently unsupported." - echo "Sorry." - echo - echo There are unresolved issues relating to ncurses not - echo being included in NetBSD®, and these provided by pkgsrc® - echo lack important header files. + # supported with no extra quirks at the moment ;; OpenBSD) # supported with no extra quirks at the moment @@ -191,13 +186,12 @@ if [[ $X != *@(Native compiler works)* ]]; then out=1 fi -[[ -s /usr/include/ncurses.h ]] || if [[ -s /usr/pkg/include/ncurses.h ]]; then - echo 'HOSTCFLAGS+= -isystem /usr/pkg/include' >>$topdir/prereq.mk - echo 'HOSTLDFLAGS+=-L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib' >>$topdir/prereq.mk -else - echo Install ncurses header files, please. - echo - out=1 +if [[ ! -s /usr/include/ncurses.h ]]; then + if [[ ! -s /usr/include/curses.h ]]; then + echo Install ncurses header files, please. + echo + out=1 + fi fi if ! which gawk >/dev/null 2>&1; then |