httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/mpmt Makefile.in
Date Sun, 09 Jul 2000 18:54:08 GMT
rbb         00/07/09 11:54:08

  Modified:    src/modules/mpm config.m4
               src/modules/mpm/mpmt Makefile.in
  Log:
  Fix building the mpmt MPM.  The problem was that IfModule uses the name of
  the C file to determine if a module is present.  mpmt emulates three
  different MPMs though.  If the default config file we have sane defaults
  for each of the three MPMs that mpmt emulates.
  
  To fix this, the build process creates a soft link to the original MPM name
  during the configure process, and the build process actually compiles that
  file, instead of the original mpmt.c.  This allow the mpmt MPM to work
  just as well as mpmt_pthread.
  
  Revision  Changes    Path
  1.22      +14 -0     apache-2.0/src/modules/mpm/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- config.m4	2000/07/08 14:29:13	1.21
  +++ config.m4	2000/07/09 18:54:08	1.22
  @@ -50,10 +50,23 @@
       AC_CACHE_SAVE
     fi
   
  +dnl The MPM_FAKE_NAME allow the mpmt MPM to emulate all of the MPMs without
  +dnl Apache actually knowing it.  The problem is IfModule.  IfModule uses
  +dnl the C file's name to know if the module is loaded.  Without this change
  +dnl mpmt always shows up as mpmt.c, and we can't distinguish between all
  +dnl of the emulated MPMs.
  +dnl
  +dnl This fixes that by creating a soft link that has the name of the
  +dnl desired MPM to mpmt.c.  Now, Apache can search for the specified MPM
  +dnl and actually find it.
     if test "$MPM_NAME" = "mpmt_pthread" ; then
       EXTRA_CFLAGS="$EXTRA_CFLAGS -DMPMT_PTHREAD"
  +    MPM_FAKE_NAME=mpmt_pthread.c
  +    ln -s mpmt.c modules/mpm/mpmt/mpmt_pthread.c
     elif test "$MPM_NAME" = "dexter" ; then
       EXTRA_CFLAGS="$EXTRA_CFLAGS -DDEXTER"
  +    MPM_FAKE_NAME=dexter.c
  +    ln -s mpmt.c modules/mpm/mpmt/dexter.c
     fi
   
     if test "$MPM_NAME" = "dexter" -o "$MPM_NAME" = "mpmt_pthread"; then
  @@ -67,6 +80,7 @@
   fi
   
   APACHE_SUBST(MPM_NAME)
  +APACHE_SUBST(MPM_FAKE_NAME)
   MODLIST="$MODLIST mpm_${MPM_NAME}"
   
   dnl Check for pthreads and attempt to support it
  
  
  
  1.2       +3 -1      apache-2.0/src/modules/mpm/mpmt/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2000/07/07 17:35:43	1.1
  +++ Makefile.in	2000/07/09 18:54:08	1.2
  @@ -1,5 +1,7 @@
   
  +CLEANFILES = mpmt_pthread.c dexter.c
  +
   LTLIBRARY_NAME    = libmpmt.la
  -LTLIBRARY_SOURCES = mpmt.c scoreboard.c
  +LTLIBRARY_SOURCES = $(MPM_FAKE_NAME) scoreboard.c
   
   include $(top_srcdir)/build/ltlib.mk
  
  
  

Mime
View raw message