Strip SHARED_CORE deadwood.

PR 46239

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@893044 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/man/httpd.8 b/docs/man/httpd.8
index 3e9734be298e6ea746c238e6288c7a58e5add2cc..d8819e0f1895235b93c0b0ae2d8bc1bb0cf8d231 100644 (file)
--- a/docs/man/httpd.8
+++ b/docs/man/httpd.8
@@ -73,9 +73,6 @@ Sets the LogLevel to \fIlevel\fR during server startup\&. This is useful for tem
 -E \fIfile\fR
 Send error messages during server startup to \fIfile\fR\&.  
 .TP
--R \fIdirectory\fR
-When the server is compiled using the SHARED_CORE rule, this specifies the \fIdirectory\fR for the shared object files\&.  
-.TP
 -h
 Output a short summary of available command line options\&.  
 .TP

diff --git a/docs/manual/programs/httpd.xml b/docs/manual/programs/httpd.xml
index 93328a8b18f6cc18407b0807374c6939b0c8efc1..c33d7334ecf5394408990bbc4ab2d510c4b0f57b 100644 (file)
--- a/docs/manual/programs/httpd.xml
+++ b/docs/manual/programs/httpd.xml
@@ -122,12 +122,6 @@ problems during startup.</dd>
 
 <dd>Send error messages during server startup to <var>file</var>.</dd>
 
-<dt><code>-R <var>directory</var></code></dt>
-
-<dd>When the server is compiled using the <code>SHARED_CORE</code>
-rule, this specifies the <var>directory</var> for the shared
-object files.</dd>
-
 <dt><code>-h</code></dt>
 
 <dd>Output a short summary of available command line options.</dd>

diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index fdcfec3fc6e21d241aa26896d0e026312e729e5e..5ccfc8047eba6ff7612ba9bbff240d3915a5337e 100644 (file)
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -503,10 +503,6 @@ static int show_server_settings(request_rec * r)
     ap_rputs(" -D NEED_HASHBANG_EMUL\n", r);
 #endif
 
-#ifdef SHARED_CORE
-    ap_rputs(" -D SHARED_CORE\n", r);
-#endif
-
 /* This list displays the compiled in default paths: */
 #ifdef HTTPD_ROOT
     ap_rputs(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n", r);
@@ -516,10 +512,6 @@ static int show_server_settings(request_rec * r)
     ap_rputs(" -D SUEXEC_BIN=\"" SUEXEC_BIN "\"\n", r);
 #endif
 
-#if defined(SHARED_CORE) && defined(SHARED_CORE_DIR)
-    ap_rputs(" -D SHARED_CORE_DIR=\"" SHARED_CORE_DIR "\"\n", r);
-#endif
-
 #ifdef DEFAULT_PIDLOG
     ap_rputs(" -D DEFAULT_PIDLOG=\"" DEFAULT_PIDLOG "\"\n", r);
 #endif

diff --git a/server/main.c b/server/main.c
index ba538261c4da5aab6b56e2d44d8802d0e5148d14..10ba9787ac1d0c84e5fd72fb46c8e5867e88eba2 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -212,10 +212,6 @@ static void show_compile_settings(void)
     printf(" -D NEED_HASHBANG_EMUL\n");
 #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");
@@ -225,10 +221,6 @@ static void show_compile_settings(void)
     printf(" -D SUEXEC_BIN=\"" SUEXEC_BIN "\"\n");
 #endif
 
-#if defined(SHARED_CORE) && defined(SHARED_CORE_DIR)
-    printf(" -D SHARED_CORE_DIR=\"" SHARED_CORE_DIR "\"\n");
-#endif
-
 #ifdef DEFAULT_PIDLOG
     printf(" -D DEFAULT_PIDLOG=\"" DEFAULT_PIDLOG "\"\n");
 #endif
@@ -343,14 +335,8 @@ static void usage(process_rec *process)
 
     pad[i] = '\0';
 
-#ifdef SHARED_CORE
-    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL ,
-                 "Usage: %s [-R directory] [-D name] [-d directory] [-f file]",
-                 bin);
-#else
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "Usage: %s [-D name] [-d directory] [-f file]", bin);
-#endif
 
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "       %s [-C \"directive\"] [-c \"directive\"]", pad);
@@ -374,12 +360,6 @@ static void usage(process_rec *process)
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "Options:");
 
-#ifdef SHARED_CORE
-    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
-                 "  -R directory       : specify an alternate location for "
-                 "shared object files");
-#endif
-
     ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                  "  -D name            : define a name for use in "
                  "<IfDefine name> directives");