stop exporting APACHE_MPM_DIR to modules -- unclear why this was ever necessary,...

  makes no sense with loadable MPMs
axe the unnecessary MPM_DIR build variable
move the stray APACHE_SUBST(MPM_LIB) from configure.in to server/mpm/config.m4, where
  the other MPM_foos are handled

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

diff --git a/configure.in b/configure.in
index 45083891c4928db47ef787aa4c80293f59f41236..3b180d26c7dabbde14b99088060cf5420fe933cd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -538,7 +538,6 @@ dnl reading config stubs
 esyscmd(./build/config-stubs .)
 
 APACHE_SUBST(progname)
-APACHE_SUBST(MPM_LIB)
 APACHE_SUBST(OS)
 APACHE_SUBST(OS_DIR)
 APACHE_SUBST(BUILTIN_LIBS)
@@ -677,8 +676,6 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
        [Location of the config file, relative to the Apache root directory])
 AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
        [Location of the MIME types config file, relative to the Apache root directory])
-AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
-       [Location of the source for the current MPM])
 
 perlbin=`$ac_aux_dir/PrintPath perl`
 if test "x$perlbin" = "x"; then

diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index baeec0526d0ae9d1a5c0d12de9fb6d9e8d66241e..602fdc8227b4142a7e9618624495e4e3893fc1bb 100644 (file)
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -402,10 +402,6 @@ static int show_server_settings(request_rec * r)
     ap_rputs(" -D OS=\"" OS "\"\n", r);
 #endif
 
-#ifdef APACHE_MPM_DIR
-    ap_rputs(" -D APACHE_MPM_DIR=\"" APACHE_MPM_DIR "\"\n", r);
-#endif
-
 #ifdef HAVE_SHMGET
     ap_rputs(" -D HAVE_SHMGET\n", r);
 #endif

diff --git a/os/netware/os.h b/os/netware/os.h
index 86a93fa6d231b57d5243f6103213f69645ba2698..50dfe180a77046962c0de695cb448a943c350577 100644 (file)
--- a/os/netware/os.h
+++ b/os/netware/os.h
@@ -46,8 +46,6 @@ AP_DECLARE_DATA extern int hold_screen_on_exit; /* Indicates whether the screen
 #define CASE_BLIND_FILESYSTEM
 #define NO_WRITEV
 
-#define APACHE_MPM_DIR  "server/mpm/netware" /* generated on unix */
-
 #define getpid NXThreadGetId
 
 /* Hold the screen open if there is an exit code and the hold_screen_on_exit flag >= 0 or the

diff --git a/os/win32/os.h b/os/win32/os.h
index 0b433996d8eb6322de4c65d0df61fac9f18d6492..2a70bf84d9163ff5ac41db332213a69d384ea4d2 100644 (file)
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -52,10 +52,6 @@
 #define HAVE_UNC_PATHS
 #define CASE_BLIND_FILESYSTEM
 
-#ifndef __MINGW32__
-#define APACHE_MPM_DIR  "server/mpm/winnt" /* generated on unix */
-#endif
-
 #include <stddef.h>
 
 #ifdef __cplusplus

diff --git a/server/main.c b/server/main.c
index b43daf964097835a262518c7b1c259f19cee41a9..948c56f7d67c3e45719da77f8719f8599ef39bb9 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -123,10 +123,6 @@ static void show_compile_settings(void)
     printf(" -D OS=\"" OS "\"\n");
 #endif
 
-#ifdef APACHE_MPM_DIR
-    printf(" -D APACHE_MPM_DIR=\"" APACHE_MPM_DIR "\"\n");
-#endif
-
 #ifdef HAVE_SHMGET
     printf(" -D HAVE_SHMGET\n");
 #endif

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index dd5d7a80fa47b6c85a488786be9f51972106718c..fd58b009b9a3d85c083cb25dd01daa981a1bd3ab 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -57,17 +57,14 @@ if test "$apache_cv_mpm" = "shared"; then
   MPM_NAME=""
   MPM_SUBDIR_NAME=""
   MPM_LIB=""
-  MPM_DIR=""
 else
   MPM_NAME=$apache_cv_mpm
   MPM_SUBDIR_NAME=$MPM_NAME
-  MPM_DIR=server/mpm/$MPM_SUBDIR_NAME
-  MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
+  MPM_LIB=server/mpm/$MPM_SUBDIR_NAME/lib${MPM_NAME}.la
 
-  APACHE_SUBST(MPM_NAME)
-  APACHE_SUBST(MPM_SUBDIR_NAME)
   MODLIST="$MODLIST mpm_${MPM_NAME}"
 fi
 
 APACHE_SUBST(MPM_NAME)
 APACHE_SUBST(MPM_SUBDIR_NAME)
+APACHE_SUBST(MPM_LIB)

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 9d16fe900b68270204e0466ac658beb5e990fe1a..8dde964d4a15da3421f74a2243167807f60c7e24 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -106,7 +106,7 @@
 #define WORKER_READY        SERVER_READY
 #define WORKER_IDLE_KILL    SERVER_IDLE_KILL
 
-#define MPM_HARD_LIMITS_FILE APACHE_MPM_DIR "/mpm_default.h"
+#define MPM_HARD_LIMITS_FILE "/mpm_default.h"
 
 /* config globals */