Commit 00f23758 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Allow modules to be added to the server at configure time. The syntax 

is:

--with-module=module_type:/path/to/module

module_type is the directory under modules/ that the module should be
copied to.  Currently, this only adds static modules


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

CHANGES

+7 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.17-dev



  *) Allow module authors to add a module to their Apache build using

     --with-module, without re-running buildconf.  The syntax is:

	--with-module=module_type:/path/to/module.c

     The configure script will copy the module.c file to 

     modules/module_type, and it will be added to the relevant Makefiles.

     currently, this only works for static modules.  [Ryan Bloom]



  *) Changes required to make prefork clean up idle children properly.

     There was a window during which a starting worker deadlocks when

     an idle cleanup arrives before it completes init. Apache then keeps

modules/config5.m4

0 → 100644
+43 −0
Original line number Diff line number Diff line 
AC_MSG_CHECKING(for extra modules)

AC_ARG_WITH(module,

  [  --with-module=location  Include the specified module.  location is the

                          path to the new module.],

  [

    modtype=`echo $withval | sed -e's/\(.*\):.*/\1/'`

    pkg=`echo $withval | sed -e's/.*:\(.*\)/\1/'`

    modfilec=`echo $pkg | sed -e 's;^.*/;;'`

    modfileo=`echo $pkg | sed -e 's;^.*/;;' -e 's;\.c$;.o;'`



    if test "x$withval" != "xmodules/$modtype/$modfilec"; then

        cp $pkg modules/$modtype/$modfilec

    fi

    module=`echo $pkg | sed -e 's;.*/mod_\(.*\).c;\1;'`

    objects="mod_$module.lo"

    libname="mod_$module.la"

    modpath_current="modules/$modtype"

    BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"

    if test ! -s "$modpath_current/modules.mk"; then

      cat >>$modpath_current/modules.mk<<EOF

$libname: $objects

	\$(MOD_LINK) $objects

DISTCLEAN_TARGETS = modules.mk

static = $libname

shared =

EOF

    else

      cat >>$modpath_current/modules.mk.tmp<<EOF

$libname: $objects

	\$(MOD_LINK) $objects

EOF

      cat $modpath_current/modules.mk >> $modpath_current/modules.mk.tmp

      rm $modpath_current/modules.mk

      mv $modpath_current/modules.mk.tmp $modpath_current/modules.mk

      sed -e "s/\(static =.*\)/\1 $libname/" $modpath_current/modules.mk > $modpath_current/modules.mk.tmp

      rm $modpath_current/modules.mk

      mv $modpath_current/modules.mk.tmp $modpath_current/modules.mk

    fi

    MODLIST="$MODLIST $module"

  AC_MSG_RESULT(added $withval)

  ],

  [ AC_MSG_RESULT(no extra modules) 

  ])