You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2009/03/31 13:34:53 UTC
svn commit: r760403 - in /httpd/httpd/trunk: configure.in
modules/generators/mod_info.c os/netware/os.h os/win32/os.h server/main.c
server/mpm/config.m4 server/mpm/netware/mpm_netware.c
Author: trawick
Date: Tue Mar 31 11:34:49 2009
New Revision: 760403
URL: http://svn.apache.org/viewvc?rev=760403&view=rev
Log:
stop exporting APACHE_MPM_DIR to modules -- unclear why this was ever necessary, and it
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
Modified:
httpd/httpd/trunk/configure.in
httpd/httpd/trunk/modules/generators/mod_info.c
httpd/httpd/trunk/os/netware/os.h
httpd/httpd/trunk/os/win32/os.h
httpd/httpd/trunk/server/main.c
httpd/httpd/trunk/server/mpm/config.m4
httpd/httpd/trunk/server/mpm/netware/mpm_netware.c
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=760403&r1=760402&r2=760403&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Tue Mar 31 11:34:49 2009
@@ -538,7 +538,6 @@
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 @@
[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
Modified: httpd/httpd/trunk/modules/generators/mod_info.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_info.c?rev=760403&r1=760402&r2=760403&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_info.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_info.c Tue Mar 31 11:34:49 2009
@@ -402,10 +402,6 @@
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
Modified: httpd/httpd/trunk/os/netware/os.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/netware/os.h?rev=760403&r1=760402&r2=760403&view=diff
==============================================================================
--- httpd/httpd/trunk/os/netware/os.h (original)
+++ httpd/httpd/trunk/os/netware/os.h Tue Mar 31 11:34:49 2009
@@ -46,8 +46,6 @@
#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
Modified: httpd/httpd/trunk/os/win32/os.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/os.h?rev=760403&r1=760402&r2=760403&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/os.h (original)
+++ httpd/httpd/trunk/os/win32/os.h Tue Mar 31 11:34:49 2009
@@ -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
Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=760403&r1=760402&r2=760403&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Tue Mar 31 11:34:49 2009
@@ -123,10 +123,6 @@
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
Modified: httpd/httpd/trunk/server/mpm/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/config.m4?rev=760403&r1=760402&r2=760403&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/config.m4 (original)
+++ httpd/httpd/trunk/server/mpm/config.m4 Tue Mar 31 11:34:49 2009
@@ -57,17 +57,14 @@
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)
Modified: httpd/httpd/trunk/server/mpm/netware/mpm_netware.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/netware/mpm_netware.c?rev=760403&r1=760402&r2=760403&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/netware/mpm_netware.c (original)
+++ httpd/httpd/trunk/server/mpm/netware/mpm_netware.c Tue Mar 31 11:34:49 2009
@@ -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 */