Changes to m4/src/main.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/09/14 00:37:26

Index: src/main.c
===================================================================
RCS file: /sources/m4/m4/src/main.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- src/main.c  7 Sep 2006 23:53:04 -0000       1.80
+++ src/main.c  14 Sep 2006 00:37:26 -0000      1.81
@@ -24,21 +24,12 @@
 #include "getopt.h"
 #include "version-etc.h"
 #include "gnu/progname.h"
+#include "pathconf.h"
 
 #include <limits.h>
 
 #define AUTHORS _("Rene' Seindal"), "Gary V. Vaughan"
 
-
-/* Name of frozen file to digest after initialization.  */
-const char *frozen_file_to_read = NULL;
-
-/* Name of frozen file to produce near completion.  */
-const char *frozen_file_to_write = NULL;
-
-/* If nonzero, import the environment as macros.  */
-static bool import_environment = false;
-
 typedef struct macro_definition
 {
   struct macro_definition *next;
@@ -105,9 +96,10 @@
       printf (_("\
 \n\
 Dynamic loading features:\n\
-  -M, --module-directory=DIR   add DIR to the module search path\n\
-  -m, --load-module=MODULE     load dynamic MODULE from %s\n\
-"), USER_MODULE_PATH_ENV);
+  -M, --module-directory=DIR   add DIR to module search path before\n\
+                               `%s'\n\
+  -m, --load-module=MODULE     load dynamic MODULE\n\
+"), MODULE_PATH);
       fputs (_("\
 \n\
 Preprocessor features:\n\
@@ -237,12 +229,15 @@
   FILE *fp;
   char *filename;
   bool read_stdin = false;     /* true iff we have read from stdin */
+  bool import_environment = false; /* true to import environment */
+  const char *frozen_file_to_read = NULL;
+  const char *frozen_file_to_write = NULL;
 
   m4 *context;
 
   int exit_status;
 
-  /* Initialise gnulib error module.  */
+  /* Initialize gnulib error module.  */
   set_program_name (argv[0]);
 
   setlocale (LC_ALL, "");