diff options
| author | Ryan Bloom <rbb@apache.org> | 2001-10-11 05:42:53 +0200 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2001-10-11 05:42:53 +0200 |
| commit | 705737ea7905f50724e98a3a94512a67dae8253b (patch) | |
| tree | aae3636b3c8085c599fb8a9fe82c8c3ee8765b39 /Makefile.in | |
| parent | This is the mod_ssl input filtering rewrite. Lots of stuff here. I also (diff) | |
| download | apache2-705737ea7905f50724e98a3a94512a67dae8253b.tar.xz apache2-705737ea7905f50724e98a3a94512a67dae8253b.zip | |
Fixed the configure script to add a LoadModule directive to
the default httpd.conf for any module that was compiled
as a DSO.
Submitted by: Aaron Bannert <aaron@clove.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91415 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 9a94569b96..2ba620ae4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,9 +36,31 @@ install-conf: done; \ for i in *-std* ldap.conf proxy.conf ssl.conf; do \ [ -f $$i ] || continue; \ - sed -e 's#@@ServerRoot@@#$(prefix)#g' \ - -e 's#@@Port@@#$(PORT)#g' \ - < $$i > $(sysconfdir)/$$i; \ + ( \ + n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ + if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \ + sed -e 's#@@ServerRoot@@#$(prefix)#g' \ + -e 's#@@Port@@#$(PORT)#g' \ + -e '/@@LoadModule@@/d' \ + < $$i; \ + else \ + sed -n -e '/@@LoadModule@@/q' \ + -e 's#@@ServerRoot@@#$(prefix)#g' \ + -e 's#@@Port@@#$(PORT)#g' \ + -e 'p' \ + < $$i; \ + for j in $(DSO_MODULES) "^EOL^"; do \ + if test $$j != "^EOL^"; then \ + echo "LoadModule $${j}_module modules/mod_$${j}.so"; \ + fi; \ + done; \ + sed -e '1,/@@LoadModule@@/d' \ + -e '/@@LoadModule@@/d' \ + -e 's#@@ServerRoot@@#$(prefix)#g' \ + -e 's#@@Port@@#$(PORT)#g' \ + < $$i; \ + fi \ + ) > $(sysconfdir)/$$i; \ chmod 0644 $(sysconfdir)/$$i; \ file=`echo $$i|sed s/-std//`; \ if [ "$$file" = "httpd.conf" ]; then \ |