1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

103 Commits

Author SHA1 Message Date
Greg Ames
b8c867e651 OS/390: install apachecore.[dll|x] in lib/ rather than bin/ .
The LIBPATH env var already must contain the path to lib/ in order to pick up
apr and apr-util.  If we install the core dll there as well, LIBPATH becomes
simpler.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94053 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 16:05:33 +00:00
Jeff Trawick
3a2b57187a Fix apxs -g handling.
Move config_vars.mk from the top build directory to the build directory.
Get build/rules.mk cleaned up for distclean/extraclean.

PR:     10163
        (This is the 2nd of two commits for that PR.  The first was to
        apxs.in -- rev 1.35.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93923 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 03:16:50 +00:00
Justin Erenkrantz
0db9f67bf4 Stop copying APR's libtool. And pass enough parameters to apr's subconfig
so that it can figure out where we would like libtool to be installed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93816 13f79535-47bb-0310-9956-ffa450edef68
2002-03-09 19:29:18 +00:00
Aaron Bannert
aeba70f8e4 It is bad to recursively remove every CVS directory in a person's
home directory. Bad bad bad. Make sure the variable was set to something
before cd-ing to blank and ending up in their $HOME.

Also, since each line under a make rule is treated as a new subshell,
it's not necessary to surround the whole line in ()s.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93766 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 15:06:07 +00:00
Ian Holsman
509417f221 need to copy mod_log_config over for custom-loggers
Obtained from: Steve Linde


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93541 13f79535-47bb-0310-9956-ffa450edef68
2002-02-22 20:09:25 +00:00
Aaron Bannert
edba27a465 Currently pcre/config.h and pcre/internal.h are getting installed - it
seems they aren't used, and adding a rogue config.h into the include
path can cause problems for a module which picks it up.

(Better late than never -- this patch was submitted Fri, 7 Dec 2001.)

Submitted by:	Joe Orton <joe@manyfish.co.uk>
Reviewed by:	Aaron Bannert


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92979 13f79535-47bb-0310-9956-ffa450edef68
2002-01-23 07:10:16 +00:00
Ryan Bloom
cedc2b7b6e Make sure we use the same version of Make for building suexec as we do
for building the rest of the package.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92906 13f79535-47bb-0310-9956-ffa450edef68
2002-01-18 17:57:31 +00:00
Doug MacEachern
68538b764b need to use $(top_srcdir) when installing build/instdso.sh
else make install does not work when when configured with a --srcdir
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92753 13f79535-47bb-0310-9956-ffa450edef68
2002-01-06 17:39:52 +00:00
Jeff Trawick
7dc8e9bfab Move any load library path environment variables out of
apachectl and into a separate environment variable file which
can be more easily tailored by the admin.  The environment
variable file as built by Apache may have additional system-
specific settings.  For example, on OS/390 we tailor the heap
settings to allow lots of threads.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92490 13f79535-47bb-0310-9956-ffa450edef68
2001-12-15 13:56:36 +00:00
Jeff Trawick
a880503796 make sure mod_foo.so is installed by apxs -i
also, it is the .so file that needs to be executable, not the .la file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92376 13f79535-47bb-0310-9956-ffa450edef68
2001-12-07 19:06:58 +00:00
Ryan Bloom
f4c07f4c74 Fix the installation target to make sure that the manual is
installed in the correct location.

PR:	8851
Submitted by:	Yoshifumi Hiramatsu <hiramatu@boreas.dti.ne.jp>
                and Gomez Henri <hgomez@slib.fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92164 13f79535-47bb-0310-9956-ffa450edef68
2001-11-24 15:52:44 +00:00
Aaron Bannert
dc1c1a7ae5 mod_ssl is big and bulky, takes awhile to load, sometimes must wait for
entropy to be collected, and has a nasty little bug that prevents the
server from being started in non-SSL mode. This patch corrects some of
those problems, but is not intended as a workaround for the bug.

Submitted by:	Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:	Aaron Bannert


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92145 13f79535-47bb-0310-9956-ffa450edef68
2001-11-23 17:45:52 +00:00
William A. Rowe Jr
5477dfb420 Remerge proxy configuration. Tally: of 9 votes;
Majority for segregating mod_ssl
  Minority for segregating mod_proxy

  Also remove a lingering bit of ldap config from httpd-std.conf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91631 13f79535-47bb-0310-9956-ffa450edef68
2001-10-22 12:46:29 +00:00
Ryan Bloom
136840e51a Teach me to copy and paste.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91552 13f79535-47bb-0310-9956-ffa450edef68
2001-10-18 20:56:49 +00:00
Ryan Bloom
8966449b5a Make sure we install the proxy header file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91550 13f79535-47bb-0310-9956-ffa450edef68
2001-10-18 19:59:00 +00:00
Ryan Bloom
705737ea79 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
2001-10-11 03:42:53 +00:00
Martin Kraemer
e04745a32a Rename ssl-std.conf to match Makefile.in's installation action
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91347 13f79535-47bb-0310-9956-ffa450edef68
2001-10-08 10:15:37 +00:00
Justin Erenkrantz
3e67afb1b3 Make sure we run the new conf files through sed.
Now, the question is whether it might make more sense to have them
as ssl-std.conf, ldap-std.conf, and proxy-std.conf.

(I'm also not sure if this is even shell portable or not.)

I'll leave that up to OtherBill since he added these files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91303 13f79535-47bb-0310-9956-ffa450edef68
2001-10-05 03:27:56 +00:00
Ryan Bloom
0540c7d228 Suexec is compiled to the builddir, not the source dir.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91246 13f79535-47bb-0310-9956-ffa450edef68
2001-10-02 21:53:33 +00:00
Ryan Bloom
fa56f6e746 If we are going to have an optional function, we have to install that
header file, so that people can use it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91069 13f79535-47bb-0310-9956-ffa450edef68
2001-09-18 15:02:19 +00:00
Ryan Bloom
60417f3f5f Allow make install to work when built with VPATH.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91024 13f79535-47bb-0310-9956-ffa450edef68
2001-09-13 22:19:13 +00:00
Ryan Bloom
73f768d207 rules.mk is stored in $(top_blddir). Without this change, VPATH builds
stop working.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91017 13f79535-47bb-0310-9956-ffa450edef68
2001-09-13 06:49:09 +00:00
Ryan Bloom
dbef4dc53e Install the mod_core.h file. Mod_proxy relies on it.
Submitted by:	Ian Holsman <ianh@cnet.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90849 13f79535-47bb-0310-9956-ffa450edef68
2001-08-31 15:32:31 +00:00
Greg Ames
24e2aa83a0 fix suexec's install by invoking some powerful Sascha magic.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90795 13f79535-47bb-0310-9956-ffa450edef68
2001-08-30 03:45:30 +00:00
Ryan Bloom
290abd5a65 Fix a typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90712 13f79535-47bb-0310-9956-ffa450edef68
2001-08-27 03:35:51 +00:00
Ryan Bloom
6f7bc4aede Improvements to APXS. It now uses the config_vars.mk variables to
figure out how to build stuff.  It uses the Apache build system for
the generated module, but not for command line builds.  Maybe I'll fix
that one day.  If somebody wants to beat me to it, that would be cool.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90696 13f79535-47bb-0310-9956-ffa450edef68
2001-08-26 06:25:00 +00:00
Martin Kraemer
46956f4ebb My first try at relocating the manual tree outside of the htdocs/ directory.
It will now reside in the ServerRoot, alongside with .../man/ and .../icons/
and .../htdocs/
-
Please review the config.layout entries for the vendor specific entries,
I supplied sensible defaults but you may disagree.

Reviewed by:	William A. Rowe, Jr., Joshua Slive, Rich Bowen


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90551 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 15:17:02 +00:00
William A. Rowe Jr
71a6826b28 If my grep and brain are working, that's all there is to adding error/
to the *nix build.  If I'm wrong, don't shoot.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90412 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 18:45:55 +00:00
Ryan Bloom
3e62f93cd4 Install the SSL header files.
Submitted by:	John Sterling <sterling@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90145 13f79535-47bb-0310-9956-ffa450edef68
2001-08-13 23:06:06 +00:00
Ryan Bloom
9ca6b593ef Install all build/*.mk when we install Apache. This is the first step
to getting apxs to use the same makefiles as Apache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89776 13f79535-47bb-0310-9956-ffa450edef68
2001-07-30 02:55:55 +00:00
Ryan Bloom
a7582cf16c install the man pages when we install everything else.
PR:	7754


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89500 13f79535-47bb-0310-9956-ffa450edef68
2001-07-05 05:25:19 +00:00
Ben Laurie
102fde2e91 Doxygenation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89235 13f79535-47bb-0310-9956-ffa450edef68
2001-05-28 15:32:50 +00:00
Roy T. Fielding
62367507a9 Change the make targets and rules to be consistent in all of the
Apache-owned source trees.  Sanity is a good thing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89140 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 00:48:57 +00:00
Jeff Trawick
9fba321f34 Add a missing backslash in the install-other code so that the httpd.dll
logic isn't displayed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88977 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 19:09:21 +00:00
Brian Havard
baa865bddf OS/2: fix "make install" to install shared core & programs with a .exe
extension.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88963 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 08:25:52 +00:00
David Reid
de6f0796e9 This changes the build process as outlined in my email earlier this week.
Essentially we now build the static objects, then allow a platform to run
a given command, build the shared modules, then run another command before exiting.

This gets us building dso's on beos and may provide a better framework for some of
the other "strange" platforms out there without stopping the normal ones working.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88886 13f79535-47bb-0310-9956-ffa450edef68
2001-04-18 20:51:35 +00:00
Ryan Bloom
575247be29 Do not install the binaries from the support directory twice.
PR:	7490
Submitted by:	jun-ichiro hagino <itojun@iijlab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88836 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 00:46:22 +00:00
Roy T. Fielding
efd42bd8a4 Make clean, distclean, and extraclean consistently according to the
Gnu makefile guidelines.

Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:  Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88809 13f79535-47bb-0310-9956-ffa450edef68
2001-04-11 06:44:07 +00:00
Victor J. Orlikowski
8eea3bbd7a Fix errors in generating docco using make docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88788 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 17:48:08 +00:00
Marc Slemko
afe19afd61 - change inconsistent use of logdir and logfiledir all to logfiledir, to
make the config.layout file work properly.
- change default layout to be "Apache", as defined in config.layout,
  instead of duplicating (some of) that layout in configure itself.
- change default installation path to /usr/local/apache2

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88692 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 17:03:35 +00:00
Victor J. Orlikowski
28f7a845a1 Changes to get AIX DSOs working, sans APR changes.
Basically, this allows linker flags to be passed for the httpd executable
and DSOs only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88655 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 19:06:02 +00:00
Brian Havard
dea84b1a0b Switch to using aplibtool for building under OS/2 & add support for building
loadable modules as OS/2 DLLs.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88645 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 15:20:45 +00:00
Ben Laurie
759dfd4d71 First step in doxygen conversion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88490 13f79535-47bb-0310-9956-ffa450edef68
2001-03-11 14:54:13 +00:00
Ryan Bloom
220906dd72 don't try to install expat, since it isn't there anymore.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88478 13f79535-47bb-0310-9956-ffa450edef68
2001-03-09 04:36:48 +00:00
Greg Ames
28d9086425 turn on setuid permissions when installing suexec
Submitted by: Ken Coar


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88467 13f79535-47bb-0310-9956-ffa450edef68
2001-03-07 23:13:55 +00:00
Greg Ames
5c21e3c3fd fix make install so that suexec is installed where the server expects to
find it ( <prefix>/sbin by default).

also enable ./configure --sbindir=DIR to work as advertised.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88422 13f79535-47bb-0310-9956-ffa450edef68
2001-03-02 15:46:14 +00:00
Roy T. Fielding
7b1b30525b Intermediate change of hardcoded "helpers" reference to "build"
until I get a chance to revamp this to use APR's variables directly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88230 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 16:07:31 +00:00
Ryan Bloom
c28b6e1db0 Install all required header files. Without these, some modules can not
be compiled outside the src tree.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88011 13f79535-47bb-0310-9956-ffa450edef68
2001-02-07 19:07:46 +00:00
Ben Laurie
09dcf522a3 Make docs target work.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87898 13f79535-47bb-0310-9956-ffa450edef68
2001-01-28 20:06:18 +00:00
Ryan Bloom
d6e3b37c3a Fix a small bug that was making us create a directory called "-p" in the
build directory.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87780 13f79535-47bb-0310-9956-ffa450edef68
2001-01-21 17:39:16 +00:00