cvsdist a3cc5c0
--- gpm-1.20.1/src/lib/libcurses.c.weak-wgetch	2002-12-24 17:57:16.000000000 -0500
cvsdist a3cc5c0
+++ gpm-1.20.1/src/lib/libcurses.c	2004-03-22 15:51:24.000000000 -0500
cvsdist a3cc5c0
@@ -41,7 +41,12 @@
cvsdist a3cc5c0
 #endif /* HAVE_NCURSES_CURSES_H */
cvsdist a3cc5c0
 #endif /* HAVE_NCURSES_H */
cvsdist a3cc5c0
 
cvsdist a3cc5c0
-#define GET(win) ((win) ? wgetch(win) : getch())
cvsdist a3cc5c0
+/* If win != NULL, it must have been created by ncurses anyway.
cvsdist a3cc5c0
+   Avoid circular library dependencies.  */
cvsdist a3cc5c0
+#pragma weak wgetch
cvsdist a3cc5c0
+#pragma weak stdscr
cvsdist a3cc5c0
+
cvsdist a3cc5c0
+#define GET(win) ((win && wgetch) ? wgetch(win) : getch())
cvsdist a3cc5c0
 
cvsdist a3cc5c0
 int Gpm_Wgetch(WINDOW *win)
cvsdist a3cc5c0
 {
Zdenek Prikryl e6e7901
--- gpm-1.20.1/configure.ac.weak-wgetch	2004-03-22 15:49:51.000000000 -0500
Zdenek Prikryl e6e7901
+++ gpm-1.20.1/configure.ac	2004-03-22 15:51:24.000000000 -0500
cvsdist a3cc5c0
@@ -115,7 +115,7 @@
cvsdist a3cc5c0
             AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
cvsdist a3cc5c0
         else :; fi
cvsdist a3cc5c0
     done
cvsdist a3cc5c0
-    SHARED_LIBS="$LIBS $TERMLIBS -lc"
cvsdist a3cc5c0
+    SHARED_LIBS="-lc"
cvsdist a3cc5c0
     LIBS=$SAVELIBS ;;
cvsdist a3cc5c0
 esac