Changeset 12260

Timestamp:

06/03/09 23:19:21 (4 years ago)

Author:

BrainSlayer

Message:

ncurses patch

Location:

src/router/mtr

Files:

• Makefile (modified) (1 diff)
• config.h.in (modified) (3 diffs)
• configure (modified) (2 diffs)
• net.c (modified) (1 diff)

src/router/mtr/Makefile

@@ -102 +102 @@
 CC = armeb-linux-uclibc-gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -Os -pipe -mtune=xscale -march=armv5te -Wa,-mcpu=xscale -mno-thumb-interwork -mno-thumb  -ffunction-sections -fdata-sections -Wl,--gc-sections -DNEED_PRINTF -Wall -Wno-pointer-sign
+CFLAGS = -Os -pipe -mtune=xscale -march=armv5te -Wa,-mcpu=xscale -mno-thumb-interwork -mno-thumb  -I/home/seg/DEV/xscale/src/router/ncurses/include -L/home/seg/DEV/xscale/src/router/ncurses/lib -ffunction-sections -fdata-sections -Wl,--gc-sections -DNEED_PRINTF -lncurses -Wall -Wno-pointer-sign
 CPP = armeb-linux-uclibc-gcc -E
 CPPFLAGS = 
-CURSES_OBJ = 
+CURSES_OBJ = curses.o
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H

src/router/mtr/config.h.in

@@ -11 +11 @@
 
 /* Define to 1 if you have the <curses.h> header file. */
-#undef HAVE_CURSES_H
+#define HAVE_CURSES_H 1
 
 /* Define to 1 if you have the declaration of `errno', and to 0 if you don't.
@@ -30 +30 @@
 
 /* Define to 1 if you have the `curses' library (-lcurses). */
-#undef HAVE_LIBCURSES
+#define HAVE_LIBCURSES 1
 
 /* Define to 1 if you have the `cursesX' library (-lcursesX). */
@@ -39 +39 @@
 
 /* Define to 1 if you have the `ncurses' library (-lncurses). */
-#undef HAVE_LIBNCURSES
+#define HAVE_LIBNCURSES 1
 
 /* Define to 1 if you have the `nsl' library (-lnsl). */

src/router/mtr/configure

@@ -5647 +5647 @@
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
+  no:yes: )
     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -6209 +6209 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_CURSES 1
+#undef NO_CURSES
 _ACEOF
 

src/router/mtr/net.c

@@ -946 +946 @@
 #ifdef ENABLE_IPV6
   recvsock6 = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
-#endif
   set_fd_flags(recvsock6);
+#endif
 
   return 0;