* features.h: Joined with textconf.h to avoid name clash with

GNU Libc.
* features.c: Renamed to ...
* textconf.c: ... this
* Makefile.in, cmd.c, main.c, text.c: necessary adjustments

src/ChangeLog

@@ -1,5 +1,11 @@
 2000-09-14  Pavel Roskin  <proski@gnu.org>
 
+	* features.h: Joined with textconf.h to avoid name clash with
+	GNU Libc.
+	* features.c: Renamed to ...
+	* textconf.c: ... this
+	* Makefile.in, cmd.c, main.c, text.c: necessary adjustments
+
 	* Makefile.in: Don't make softlinks to the libraries
 
 2000-09-13  Pavel Roskin  <proski@gnu.org>

src/Makefile.in

@@ -25,7 +25,7 @@ SRCS =	dir.c util.c main.c screen.c dialog.c key.c keyxdef.c menu.c	\
 	complete.c slint.c command.c cmd.c panelize.c learn.c		\
 	listmode.c utilunix.c background.c rxvt.c			\
 	text.c popt.c findme.c poptparse.c poptconfig.c popthelp.c	\
-	filegui.c filenot.c fileopctx.c treestore.c features.c
+	filegui.c filenot.c fileopctx.c treestore.c textconf.c
 
 HDRS =	color.h file.h mouse.h user.h dialog.h find.h main.h		\
 	util.h dir.h global.h menu.h panel.h win.h mem.h		\
@@ -34,7 +34,7 @@ HDRS =	color.h file.h mouse.h user.h dialog.h find.h main.h		\
 	subshell.h view.h setup.h key.h ext.h boxes.h			\
 	hotlist.h layout.h fsusage.h mountlist.h eregex.h complete.h	\
 	myslang.h command.h cmd.h tty.h fs.h panelize.h achown.h	\
-	learn.h listmode.h features.h background.h			\
+	learn.h listmode.h background.h					\
 	x.h textconf.h i18n.h findme.h popt.h filegui.h keys.h xtty.h	\
 	poptint.h poptalloca.h fileopctx.h treestore.h
 
@@ -47,7 +47,7 @@ OBJS =	dir.o util.o screen.o dialog.o key.o keyxdef.o menu.o		\
 	cmd.o main.o panelize.o learn.o listmode.o utilunix.o		\
 	background.o rxvt.o text.o popt.o findme.o poptparse.o		\
 	poptconfig.o popthelp.o filegui.o filenot.o fileopctx.o		\
-	treestore.o features.o
+	treestore.o textconf.o
 
 #
 # Distribution variables

src/cmd.c

@@ -77,7 +77,9 @@
 #include "setup.h"
 #include "x.h"
 #include "profile.h"
-#include "features.h"
+#ifndef HAVE_X
+#include "textconf.h"
+#endif
 
 #define MIDNIGHT
 #include "../vfs/vfs.h"

src/features.h

@@ -1,12 +0,0 @@
-#ifndef __FEATURES_H
-#define __FEATURES_H
-
-#ifdef USE_NCURSES
-#define status_using_ncurses (1)
-#else
-#define status_using_ncurses (0)
-#endif
-
-extern void version (int verbose);
-
-#endif /* __FEATURES_H */

src/main.c

@@ -122,7 +122,9 @@
 #include "command.h"
 #include "wtools.h"
 #include "complete.h"		/* For the free_completion */
-#include "features.h"
+#ifndef HAVE_X
+#include "textconf.h"
+#endif
 
 #include "chmod.h"
 #include "chown.h"

src/text.c

@@ -18,7 +18,7 @@
 #include "widget.h"
 #include "main.h"
 #include "cons.saver.h"
-#include "features.h"
+#include "textconf.h"
 
 char *default_edition_colors =
 "normal=lightgray,blue:"

src/textconf.c

@@ -6,7 +6,7 @@
 #include <glib.h>
 #include "i18n.h"
 #include "cmd.h"
-#include "features.h"
+#include "textconf.h"
 
 static const char * const features [] =  {
     N_("Edition: "),

src/textconf.h

@@ -1,6 +1,7 @@
 #ifndef __TEXTCONF_H
 #define __TEXTCONF_H
-/* Defines what features are to be includes in the text mode edition */
+
+/* Features of the text mode edition */
 
 #define COMPUTE_FORMAT_ALLOCATIONS    1
 #define PORT_WIDGET_WANTS_HISTORY     1
@@ -8,4 +9,12 @@
 #define x_flush_events()
 #define port_shutdown_extra_fds()
 
+#ifdef USE_NCURSES
+#define status_using_ncurses (1)
+#else
+#define status_using_ncurses (0)
+#endif
+
+extern void version (int verbose);
+
 #endif /* __TEXTCONF_H */