* gnome/Makefile.in, src/Makefile.in, vfs/Make-mc.in: Required

        flags moved out of CFLAGS as recommended by GNU coding
        standards.
        * configure.in: Don't add GLIB_CFLAGS to CFLAGS.
        * Make.common.in: XINC eliminated. GLIB_CFLAGS is now added to
        XCPPFLAGS.
        * INSTALL (Random notes on porting to other architectures):
        Completely rewritten. Recommended using CFLAGS instead of XINC.

ChangeLog

@@ -1,3 +1,14 @@
+2000-10-06  Pavel Roskin  <proski@gnu.org>
+
+	* gnome/Makefile.in, src/Makefile.in, vfs/Make-mc.in: Required
+	flags moved out of CFLAGS as recommended by GNU coding
+	standards.
+	* configure.in: Don't add GLIB_CFLAGS to CFLAGS.
+	* Make.common.in: XINC eliminated. GLIB_CFLAGS is now added to
+	XCPPFLAGS.
+	* INSTALL (Random notes on porting to other architectures):
+	Completely rewritten. Recommended using CFLAGS instead of XINC.
+
 2000-10-05  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
 
 	* lib/mc.ext.in: .spm is used by SuSE to mark src rpms

INSTALL

@@ -404,22 +404,26 @@ Porting the program
 
 Random notes on porting to other architectures.  
 
-The Midnight Commander uses now by default the Slang library for
-handling the display.  If you can't port Slang (which should be a
-pretty trivial job), you may want to attempt using ncurses (the
-Midnight Commander can use ncurses as well as the display engine). 
-
-If you don't want to install ncurses and your OS is a SystemV Release
-4 variant, maybe the curses supplied with your system will do the
-work.  If you experience display problems, then it means that we are
-dealing with a buggy implementation of curses.  You have two options:
-one, download ncurses and recompile with ncurses or recompile all your
-source code with the symbol BUGGY_CURSES defined.  But you can always
-switch to the default SLang screen manager.
-
-The fast way to do this is to:
-
-make clean; make XINC=-DBUGGY_CURSES
+The Midnight Commander uses now by default the SLang library for
+handling the display.  You may want to download the latest version of
+SLang or use a slightly modified SLang version 0.99.38 included with
+the Midnight Commander.  The later is very stable and has been used
+for years without problems.  You shouldn't expect any problems porting
+SLang to your platform.
+
+Another possibility is to download and install ncurses on your OS.
+The Midnight Commander can use ncurses as well as the display engine.
+However, you may encounter minor differences, for instance, you will
+be unable to force the color mode by giving the "-c" switch to the
+Midnight Commander.
+
+As the last resort, you may try to use the curses library supplied with
+your OS. Beware that some systems, e.g. SystemV Release 4, include the
+curses library with bugs critical to the Midnight Commander. You may
+try to recompile all your source code with the symbol BUGGY_CURSES
+defined, i.e.
+
+make clean; make CFLAGS="-g -O -DBUGGY_CURSES"
 
 
 Obtaining the missing pieces of the Midnight Commander

Make.common.in

@@ -57,7 +57,14 @@ AWK_VAR_OPTION = @AWK_VAR_OPTION@
 # No way, to make make happy (except GNU), we cannot use := to append
 # something to these, so that's why there is a leading _
 XCFLAGS = @CFLAGS@
-XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(mclibdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
+XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. \
+	-DBINDIR=\""$(bindir)/"\" \
+	-DLIBDIR=\""$(mclibdir)/"\" \
+	-DICONDIR=\""$(icondir)/"\" \
+	-DLOCALEDIR=\""$(localedir)/"\" \
+	-DCONFDIR=\""$(confdir)/"\" \
+	-DDESKTOP_INIT_DIR=\""$(desktopdir)/"\" \
+	@GLIB_CFLAGS@
 XLDFLAGS = @LDFLAGS@
 XDEFS = @DEFS@
 XLIBS = @LIBS@

configure.in

@@ -65,7 +65,6 @@ dnl We now use glib
 dnl 
 AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(Test for GLIB failed.  MC requires GLIB.))
 LIBS="$LIBS $GLIB_LIBS"
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
 
 dnl
 dnl For A/UX.  Do not move

gnome/Makefile.in

@@ -9,7 +9,7 @@ top_srcdir = $(srcdir)/..
 
 GNOMEDEFS     = -DHAVE_X -DHAVE_GNOME @GNOME_INCLUDEDIR@
 
-CFLAGS        = -g $(XCFLAGS) @X_CFLAGS@
+CFLAGS        = $(XCFLAGS)
 CPPFLAGS      = $(XCPPFLAGS) -I. -I$(gnomedir) -I$(mcsrcdir) $(GNOMEDEFS)
 LDFLAGS       = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEUI_LIBS@
 CORBA_LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEGNORBA_LIBS@

src/Makefile.in

@@ -7,8 +7,8 @@ top_builddir = ..
 SHELL   = @SHELL@
 @MCF@
 
-CFLAGS   = $(XCFLAGS) @MCCFLAGS@
-CPPFLAGS = $(XCPPFLAGS) -DREGEX_MALLOC
+CFLAGS   = $(XCFLAGS)
+CPPFLAGS = $(XCPPFLAGS) @MCCFLAGS@ -DREGEX_MALLOC
 LDFLAGS  = $(XLDFLAGS)
 DEFS     = $(XDEFS)
 LIBS     = $(XLIBS) @TERMNET@ $(XLIB) @TERMNET@ @MCLIBS@

vfs/Make-mc.in

@@ -10,8 +10,10 @@ top_builddir = ..
 
 @MCF@
 
-CFLAGS   = $(XCFLAGS) -D_LARGEFILE64_SOURCE
-CPPFLAGS = $(XCPPFLAGS) -I. -I$(srcdir)/samba/ubiqx -I$(srcdir)/samba/smbwrapper
+SAMBA_INCLUDES = -I$(srcdir)/samba/ubiqx -I$(srcdir)/samba/smbwrapper
+
+CFLAGS   = $(XCFLAGS)
+CPPFLAGS = $(XCPPFLAGS) -D_LARGEFILE64_SOURCE -I. $(SAMBA_INCLUDES)
 LDFLAGS  = $(XLDFLAGS)
 DEFS     = $(XDEFS)
 LIBS     = @LINTL@ @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)