httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r189603 - in /httpd/httpd/trunk: build/special.mk modules/mappers/config9.m4
Date Wed, 08 Jun 2005 16:07:47 GMT
Author: jorton
Date: Wed Jun  8 09:07:46 2005
New Revision: 189603

URL: http://svn.apache.org/viewcvs?rev=189603&view=rev
Log:
* 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.

Modified:
    httpd/httpd/trunk/build/special.mk
    httpd/httpd/trunk/modules/mappers/config9.m4

Modified: httpd/httpd/trunk/build/special.mk
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/special.mk?rev=189603&r1=189602&r2=189603&view=diff
==============================================================================
--- httpd/httpd/trunk/build/special.mk (original)
+++ httpd/httpd/trunk/build/special.mk Wed Jun  8 09:07:46 2005
@@ -1,4 +1,4 @@
-# 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-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 \
-			$(top_srcdir)/build/instdso.sh SH_LIBTOOL='$(SH_LIBTOOL)' $$i $(DESTDIR)$(libexecdir);
\
-		done; \
-	fi	
+INSTALL_TARGETS = install-modules-$(INSTALL_DSO)
 
 include $(top_builddir)/build/rules.mk
+
+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
+
+install-modules-no:
 

Modified: httpd/httpd/trunk/modules/mappers/config9.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/mappers/config9.m4?rev=189603&r1=189602&r2=189603&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/config9.m4 (original)
+++ httpd/httpd/trunk/modules/mappers/config9.m4 Wed Jun  8 09:07:46 2005
@@ -43,7 +43,11 @@
 
 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



Mime
View raw message