cvs commit: apache-1.3/src/main http_main.c

[martin]

martin      98/08/12 03:33:40

  Modified:    src/main http_main.c
  Log:
  Extend the output of the -V switch to include the paths of all
  compiled-in configuration files, if they were overridden at
  compile time, for least astonishment of the user.
  
  Revision  Changes    Path
  1.385     +38 -3     apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.384
  retrieving revision 1.385
  diff -u -u -r1.384 -r1.385
  --- http_main.c       1998/08/11 20:28:22     1.384
  +++ http_main.c       1998/08/12 10:33:39     1.385
  @@ -3232,9 +3232,6 @@
   #ifdef SECURITY_HOLE_PASS_AUTHORIZATION
       printf(" -D SECURITY_HOLE_PASS_AUTHORIZATION\n");
   #endif
  -#ifdef HTTPD_ROOT
  -    printf(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n");
  -#endif
   #ifdef HAVE_MMAP
       printf(" -D HAVE_MMAP\n");
   #endif
  @@ -3306,6 +3303,44 @@
   #endif
   #ifdef SHARED_CORE
       printf(" -D SHARED_CORE\n");
  +#endif
  +
  +/* This list displays the compiled-in default paths: */
  +#ifdef HTTPD_ROOT
  +    printf(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n");
  +#endif
  +#ifdef SUEXEC_BIN
  +    printf(" -D SUEXEC_BIN=\"" SUEXEC_BIN "\"\n");
  +#endif
  +#ifdef SHARED_CORE_DIR
  +    printf(" -D SHARED_CORE_DIR=\"" SHARED_CORE_DIR "\"\n");
  +#endif
  +#ifdef DEFAULT_PIDLOG
  +    printf(" -D DEFAULT_PIDLOG=\"" DEFAULT_PIDLOG "\"\n");
  +#endif
  +#ifdef DEFAULT_SCOREBOARD
  +    printf(" -D DEFAULT_SCOREBOARD=\"" DEFAULT_SCOREBOARD "\"\n");
  +#endif
  +#ifdef DEFAULT_LOCKFILE
  +    printf(" -D DEFAULT_LOCKFILE=\"" DEFAULT_LOCKFILE "\"\n");
  +#endif
  +#ifdef DEFAULT_XFERLOG
  +    printf(" -D DEFAULT_XFERLOG=\"" DEFAULT_XFERLOG "\"\n");
  +#endif
  +#ifdef DEFAULT_ERRORLOG
  +    printf(" -D DEFAULT_ERRORLOG=\"" DEFAULT_ERRORLOG "\"\n");
  +#endif
  +#ifdef TYPES_CONFIG_FILE
  +    printf(" -D TYPES_CONFIG_FILE=\"" TYPES_CONFIG_FILE "\"\n");
  +#endif
  +#ifdef SERVER_CONFIG_FILE
  +    printf(" -D SERVER_CONFIG_FILE=\"" SERVER_CONFIG_FILE "\"\n");
  +#endif
  +#ifdef ACCESS_CONFIG_FILE
  +    printf(" -D ACCESS_CONFIG_FILE=\"" ACCESS_CONFIG_FILE "\"\n");
  +#endif
  +#ifdef RESOURCE_CONFIG_FILE
  +    printf(" -D RESOURCE_CONFIG_FILE=\"" RESOURCE_CONFIG_FILE "\"\n");
   #endif
   }