Commit 22b96681 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Stop calling shared modules libapachemod_*. mod_* is much easier to deal 

with.


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

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -250,12 +250,12 @@ AC_DEFUN(APACHE_MODPATH_ADD,[ 


  if test -z "$module_standalone"; then

    if test -z "$2"; then

      libname="libapachemod_$1.la"

      libname="mod_$1.la"

      BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"

      modpath_static="$modpath_static $libname"

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

$libname: $objects

	\$(LINK) $objects

	\$(MOD_LINK) $objects

EOF

    else

      apache_need_shared=yes

build/rules.mk

+3 −2
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@ 


LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@

SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@

MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) -o $@



# Cross compile commands