Commit fe7890e1 authored by Joe Orton's avatar Joe Orton
Browse files

* modules/mappers/config9.m4: Substitute INSTALL_DSO as "yes" if 

mod_so is linked in, or "no" otherwise.

* build/special.mk: Remove hack to guess whether mod_so is linked in
based on BUILTIN_LIBS; rely on INSTALL_DSO definition from
config_vars.mk.


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

build/special.mk

+10 −12
Changes for build/special.mk: 10 added lines, 12 removed lines.
Original line number Diff line number Diff line 
# Copyright 2000-2004 The Apache Software Foundation

# Copyright 2000-2005 The Apache Software Foundation

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -18,20 +18,18 @@ 
all: all-recursive



include $(builddir)/modules.mk



TARGETS = $(static)

SHARED_TARGETS = $(shared)

INSTALL_TARGETS = install-modules

INSTALL_TARGETS = install-modules-$(INSTALL_DSO)



include $(top_builddir)/build/rules.mk



install-modules:

	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)

	@builtin='$(BUILTIN_LIBS)'; \

	has_mod_so=`echo $$builtin|sed 's/^.*libmod_so.*$$/has_mod_so/'`; \

	if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \

		list='$(shared)'; \

		for i in $$list; do \

install-modules-yes:

	@$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)

	@list='$(shared)'; for i in $$list; do \

	  $(top_srcdir)/build/instdso.sh SH_LIBTOOL='$(SH_LIBTOOL)' $$i $(DESTDIR)$(libexecdir); \

		done; \

	fi	

	done



include $(top_builddir)/build/rules.mk

install-modules-no:

modules/mappers/config9.m4

+4 −0
Changes for modules/mappers/config9.m4: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -43,7 +43,11 @@ fi 


if test "x$enable_so" = "xstatic"; then

    APR_ADDTO(HTTPD_LDFLAGS, [-export-dynamic])

    INSTALL_DSO=yes

else

    INSTALL_DSO=no

fi

APACHE_SUBST(INSTALL_DSO)



if test "$sharedobjs" = "yes"; then

    if test $ac_cv_define_APR_HAS_DSO = "no"; then