diff --git a/configure.ac b/configure.ac index ab2b201..98ffb26 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,7 @@ No|no|N|n) SHARED_LIBS=-lc ;; AC_CHECK_LIB($i, wgetch,,,$TERMLIBS) else :; fi done - SHARED_LIBS="$LIBS $TERMLIBS -lc" + SHARED_LIBS="-lc" LIBS=$SAVELIBS ;; esac diff --git a/src/lib/libcurses.c b/src/lib/libcurses.c index e7ebf84..814cce5 100644 --- a/src/lib/libcurses.c +++ b/src/lib/libcurses.c @@ -41,7 +41,12 @@ #endif /* HAVE_NCURSES_CURSES_H */ #endif /* HAVE_NCURSES_H */ -#define GET(win) ((win) ? wgetch(win) : getch()) +/* If win != NULL, it must have been created by ncurses anyway. + Avoid circular library dependencies. */ +#pragma weak wgetch +#pragma weak stdscr + +#define GET(win) ((win && wgetch) ? wgetch(win) : getch()) int Gpm_Wgetch(WINDOW *win) {