1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-25 10:59:28 +03:00
Commit Graph

161 Commits

Author SHA1 Message Date
André Malo
558abd49fa make mod_dbd.h available for all who need it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@321489 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 20:51:05 +00:00
Justin Erenkrantz
c2a9a985f8 Use rsync to install manual and htdocs to speed up installation times.
* Makefile.in: Update install-man and install-htdocs to use rsync if available,
  otherwise fail back to current cp -rp and rm -rf .svn/ strategy.
* configure.in: Look for rsync.
* acinclude.m4: Include RSYNC in exported config_vars.mk

(Incorporates suggestions on rsync flags from colm.)

Reviewed by: colm, trawick (concept), niq (concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@292718 13f79535-47bb-0310-9956-ffa450edef68
2005-09-30 13:01:39 +00:00
Paul Querna
9f6b440739 As recommended by nd, build docs for all languages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291558 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 04:44:16 +00:00
Paul Querna
8172622940 * Makefile.in
(docs): If the "docs-build" project is available, trigger its build system
   to turn the XML sources into HTML.  Otherwise, display a URL to the
   instructions on how to use the docs build.

* build/rules.mk.in:
  (.PHONEY): docs is a fake target.

Submitted By: Daniel Rall <dlr apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291480 13f79535-47bb-0310-9956-ffa450edef68
2005-09-25 22:45:39 +00:00
Joe Orton
b8274244fa Sanitize the installed config_vars.mk to remove references to the
build and source directories, and to remove variables which are
internal to the httpd build system:

* build/config_vars.sh.in: New file.

* Makefile.in (build/config_vars.out): New target.
(install-build): Install build/config_vars.out as config_vars.mk.

* configure.in: Add include path for srclib/pcre to INCLUDES rather
than CPPFLAGS, and use a topdir-relative not absolute path name.
Generate build/config_vars.sh.

Reviewed by: Paul Querna
PR: 20874, 28145


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190392 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 12:49:58 +00:00
Joe Orton
d8d87c71ee * Makefile.in (install-build): Make installed config.nice 0755 too.
Submitted by: Daniel Rall <dlr apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@189963 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 14:17:49 +00:00
Joe Orton
99351e7f70 * Makefile.in (install-build): Fix variable names.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@189939 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 11:09:10 +00:00
Joe Orton
30d100bceb * Makefile.in (install-build): Install mkdir.sh since it's used by the
installed special.mk now; install instdso.sh as 0755.

* support/apxs.in: Fix Makefile template created by -g.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@189928 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 09:18:14 +00:00
Joe Orton
5cdbe84ebe * Makefile.in (install-build, install-headers, install-conf): Minor
cleanup: use MKINSTALLDIRS unconditionally since mkdir.sh already
checks whether the target exists; use INSTALL_DATA throughout.  Stop
trying to install os/*/os-inline.c which don't exist any more.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@189585 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 14:49:54 +00:00
Joe Orton
6d5abbac87 * Makefile.in (DISTCLEAN_TARGETS): Clean up more files generated by
configure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@189557 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 08:32:44 +00:00
Justin Erenkrantz
99cc1e829f * Makefile.in: Fix brokenness with VPATH builds as the .conf files do not exist
in srcdir and sh panics; also fix one whitespace issue.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@188844 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 18:54:25 +00:00
Jean-Frederic Clere
dce9ea54e0 Fix 32787 and the problems I have when using
--enable-experimental-libtool. (libtool is
an excutable in this case).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170920 13f79535-47bb-0310-9956-ffa450edef68
2005-05-19 12:38:57 +00:00
Joshua Slive
8d32896c9c Make sure we don't overwrite existing config if it
has a name other than httpd.conf.

Submitted by: Rici Lake


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161776 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 17:16:21 +00:00
Joshua Slive
fa4e866600 Merged the simple-conf branch changes r159781:160695 into the trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 16:59:15 +00:00
Joe Orton
502606508c Support use of an external copy of the PCRE library:
* configure.in: Set abs_{builddir,srcdir} higher.  Add --with-pcre
flag; build against external PCRE library if used.

* Makefile.in (install-include): Don't install pcre headers any more.

* srclib/Makefile.in (SUBDIRS): Remove.

PR: 27550 (part two)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153400 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 14:08:24 +00:00
Joe Orton
426571f773 * Makefile.in: Use buildmark.o not .lo since it was COMPILEd
not LT_COMPILEd.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153273 13f79535-47bb-0310-9956-ffa450edef68
2005-02-10 16:38:47 +00:00
Justin Erenkrantz
e578d12e60 Only recompile buildmark.c when we have to relink httpd.
This allows us to be able to do a make on an up-to-date tree without forcing
a recompile and relink.  Yay!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153266 13f79535-47bb-0310-9956-ffa450edef68
2005-02-10 15:32:05 +00:00
Justin Erenkrantz
7b01e2d634 * Makefile.in: Make install-man the last install target as it copies an
excruciatingly large amount of files.  (We should also filter the .svn
  sub directories before copying it, too.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109467 13f79535-47bb-0310-9956-ffa450edef68
2004-12-02 07:34:20 +00:00
Justin Erenkrantz
afc2f2d809 * Makefile.in: In the updated 5.x pcre build, pcre.h is in builddir.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106833 13f79535-47bb-0310-9956-ffa450edef68
2004-11-28 19:07:37 +00:00
Justin Erenkrantz
439221058c Initial pass at refactoring some files to eliminate our 150K C source behemoths.
* Makefile.in: Change order of dependencies to bring in exports.o first so that
  we have every symbol 'used' before the linker starts processing.
* build/rules.mk.in: Add a 'program-install' target which just copies httpd.

* server/Makefile.in, modules/http/config2.m4: Add in new file targets.

* NWGNUmakefile, libhttpd.dsp: Blind updates for Netware and Win32.  (I tried.)

* server/core.c: Move core_input_filter, net_time_filter, and core_output_filter  and all supporting functions to...
* server/core_filters.c (copied): ...here.

* modules/http/http_protocol.c: Move functions from here to there...namely:
* modules/http/byterange_filter.c (copied): Relocate ap_byterange_filter() and
  friends.
* modules/http/chunk_filter.c (copied): Relocate chunk_filter().
* modules/http/http_etag.c (copied): Relocate ap_set_etag and ap_make_etag().
* modules/http/http_filters.c (copied): Relocate ap_http_filter(),
  ap_http_header_filter(), ap_discard_request_body(), ap_setup_client_block(),
  ap_should_client_block(), and ap_get_client_block().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106692 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 08:07:44 +00:00
Paul Querna
0ecbf6ee37 Change the other install-* targets to remove the .svn directory instead of the non-existant 'CVS' one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106266 13f79535-47bb-0310-9956-ffa450edef68
2004-11-23 03:15:28 +00:00
Paul Querna
f56630d956 Replace the hack to remove CVS directories with one for Subversion '.svn' directories.
There *should* be a better way to only install the manual files, and
not the '.svn' directories.

Without this, multiple make installs to the same prefix will fail.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105916 13f79535-47bb-0310-9956-ffa450edef68
2004-11-20 02:29:28 +00:00
Joe Orton
32cbe57a5f * Makefile.in: Link httpd against user-supplied $(LIBS).
PR: 7882


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102820 13f79535-47bb-0310-9956-ffa450edef68
2004-02-29 00:33:16 +00:00
Joe Orton
3ca3524c31 Move mod_ssl-internal interfaces into ssl_private.h; allow mod_ssl.h
to be included even when mod_ssl is not enabled.

* Makefile.in (install-include): Only install mod_ssl.h.

* modules/ssl/ssl_private.h: New file.

* modules/ssl/mod_ssl.h: Move everything apart from than the optional
hook definitions into ssl_private.h.

* modules/ssl/*.c: Include ssl_private.h not mod_ssl.h

* modules/ssl/config.m4: Always add the mod_ssl directory to the
include path so other modules can find mod_ssl.h.

* modules/proxy/mod_proxy.c: Include mod_ssl.h to pick up the optional
hook definitions rather than copy'n'pasting them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102803 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 18:06:35 +00:00
Joe Orton
59ddeafec6 Fix regeneration of build datestamp on every make invocation (a
regression since 1.3).

* Makefile.in: Remove redundant PHONY_TARGETS setting.

* server/Makefile.in: Mark buildmark.c as phony; build it indirectly
via buildmarked.c since implicit rules are ignored for phony targets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102243 13f79535-47bb-0310-9956-ffa450edef68
2004-01-09 12:19:55 +00:00
Joshua Slive
c13d3d986c I knew I would get in trouble mucking with the build system.
Use topbuilddir rather than topsrcdir to find config.nice.

Submitted by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100835 13f79535-47bb-0310-9956-ffa450edef68
2003-07-29 13:40:09 +00:00
Joshua Slive
7412e577bb Install config.nice into the build/ directory to make
minor version upgrades easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100819 13f79535-47bb-0310-9956-ffa450edef68
2003-07-28 15:35:15 +00:00
Joe Orton
f1ba7c37fb Add optional hook to extend mod_status output.
* configure.in: Add modules/generators to include path.

* Makefile.in: Install mod_status.h.

* modules/generators/mod_status.h: New file.

* modules/generators/mod_status.c: Implement ap_run_status_hook.
(status_handler): Run status hooks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100724 13f79535-47bb-0310-9956-ffa450edef68
2003-07-21 14:48:02 +00:00
Roy T. Fielding
dc7892eb79 httpd.spec should be removed by make extraclean
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100519 13f79535-47bb-0310-9956-ffa450edef68
2003-07-09 14:56:28 +00:00
Jeff Trawick
14e9e18cb4 distclean/extraclean tweak: blow away docs/conf/ssl-std.conf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100303 13f79535-47bb-0310-9956-ffa450edef68
2003-06-19 13:43:28 +00:00
William A. Rowe Jr
1be1634a01 Fix my build breakage of TRU64 (hopefully, based on Jeff's feedback.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99875 13f79535-47bb-0310-9956-ffa450edef68
2003-05-16 18:30:31 +00:00
William A. Rowe Jr
223cc021ab Fix a VPATH build install bug - the special.mk file was never installed
(because we didn't rewrite it to the VPATH from the sourcepath), so copy
  any sourcepath\build\*.mk files along with the vpath\build\*.mk files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99862 13f79535-47bb-0310-9956-ffa450edef68
2003-05-16 16:01:25 +00:00
Justin Erenkrantz
d2ba87a5d7 Remove files on 'make distclean' that should be.
PR: 15592


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98684 13f79535-47bb-0310-9956-ffa450edef68
2003-02-17 01:04:40 +00:00
Justin Erenkrantz
9614a036b2 Copy mod_auth.h when installing includes.
(Allows external auth providers DSOs)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98414 13f79535-47bb-0310-9956-ffa450edef68
2003-01-21 05:59:34 +00:00
Martin Kraemer
ec59fee361 "Make install" would fail for released versions because they do not contain
CVS directories....

Noticed by Marco Lorig, mlorig at gmx dot net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97031 13f79535-47bb-0310-9956-ffa450edef68
2002-09-30 15:34:40 +00:00
Greg Ames
708afa1ea2 Install the online manual unconditionally. This gets make install closer
to how it *really* works in 1.3.

Also, get rid of CVS stuff in the manual/ directory

Submitted by: Justin Erenkrantz, Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96187 13f79535-47bb-0310-9956-ffa450edef68
2002-07-25 15:47:12 +00:00
Greg Ames
d5f052205f fix a broken build when no <prefix>/conf/ directory exists.
Submitted by:	Karl Fogel
Reviewed by:	Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96132 13f79535-47bb-0310-9956-ffa450edef68
2002-07-19 20:16:55 +00:00
Greg Ames
a20406df7a remove logic which looks for a non-existant ssl.conf file in the docs/conf/
build directory (it's ssl-std.conf there), then ignores its absence in the
next line.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96129 13f79535-47bb-0310-9956-ffa450edef68
2002-07-19 15:32:36 +00:00
Greg Ames
83aee5e314 no logic changes - just some style changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96128 13f79535-47bb-0310-9956-ffa450edef68
2002-07-19 15:23:43 +00:00
Greg Ames
3151bec9d9 Install mime.types and magic in conf/ if they don't already exist.
This also re-enables existing logic to always install *-std.conf with
substitutions made.  These are then copied into *.conf (without the -std) if
that file doesn't already exist.

style police: please chill for a bit.  I intentionally didn't re-format
the indenting in this commit to make it easier to review.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96127 13f79535-47bb-0310-9956-ffa450edef68
2002-07-19 15:11:58 +00:00
Jeff Trawick
56d3f1f5af fix make install to stop passing make operators to the shell
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95923 13f79535-47bb-0310-9956-ffa450edef68
2002-07-01 11:44:21 +00:00
Ryan Bloom
8766dab7d5 I got sick of the error messages from copying the header files. This
removes all of the error messages.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95912 13f79535-47bb-0310-9956-ffa450edef68
2002-06-29 22:58:27 +00:00
Ryan Bloom
48ee0cbe1c Preserve existing installation directories. We copy over binaries,
the build directory, the headers, and the man pages.  Everything else,
the config, htdocs, manual, error, icons, and cgi directories are
not installed if the directories already exist.  I got sick of having
to re-edit printenv for my tests, and this is the same logic 1.3 used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95911 13f79535-47bb-0310-9956-ffa450edef68
2002-06-29 16:24:35 +00:00
Cliff Woolley
e23a2130e3 The '-@' seems to be more portable than '- @'. FreeBSD complained
about the latter.

Tested on: Linux, FreeBSD, Solaris, HP/UX, Darwin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95695 13f79535-47bb-0310-9956-ffa450edef68
2002-06-15 09:41:03 +00:00
Cliff Woolley
9357eb4415 Fixed a problem with 'make install' on one of the tarballs (which
have the CVS dirs removed already) with ReliantUnix's rm:

Installing configuration files
Installing HTML documents
Usage: rm [-firR] file ...
make[1]: *** [install-htdocs] Error 2
make[1]: Leaving directory `/home1/apache20/httpd-2.0.37'
make: *** [install-recursive] Error 1

Submitted by:	Jean-frederic Clere <jfrederic.clere@fujitsu-siemens.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95691 13f79535-47bb-0310-9956-ffa450edef68
2002-06-15 06:11:45 +00:00
Ryan Bloom
230b1f5db9 Allow 'make install DESTDIR=/path'. This allows packagers to install
into a directory different from the one that was configured.  This
also mirrors the root= feature from 1.3.  We cannot use prefix=,
because both APR and APR-util resolve their installation paths at
configuration time.  This means that there is no variable prefix
to replace.

PR:	7803
Submitted by:	Andreas Hasenack <andreas@netbank.com.br>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95686 13f79535-47bb-0310-9956-ffa450edef68
2002-06-15 04:41:52 +00:00
Jeff Trawick
088354e968 On OS/390, the compiler/linker front-end doesn't handle
"-L/path/to/lib after "-o target".  After looking into build failures,
it turned out that we specify EXTRA_LDFLAGS twice (once before "-o
target" and once after "-o target") for httpd and for the support
utilities.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95484 13f79535-47bb-0310-9956-ffa450edef68
2002-06-03 15:25:11 +00:00
Brian Pane
8483e52370 Removed extraneous "{} \;" from some xargs calls
Submitted by:	Joe Orton <jorton@redhat.com>
Reviewed by:	Brian Pane


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95278 13f79535-47bb-0310-9956-ffa450edef68
2002-05-25 04:14:51 +00:00
Jeff Trawick
0b234d2510 Make sure that the runtimedir is created by make install.
PR:		9233


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95200 13f79535-47bb-0310-9956-ffa450edef68
2002-05-21 11:42:34 +00:00
Justin Erenkrantz
9ecddec061 Considering the overall goal of making APR and APR-util being used
out-of-tree, AP_LIBS can not be a PROGRAM_DEPENDENCY, but just a library
that we link against - therefore, it belongs under PROGRAM_LDADD.

(A program dependency implies that we can build it - that will not
always be the case with APR and APR-util.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95058 13f79535-47bb-0310-9956-ffa450edef68
2002-05-13 07:45:16 +00:00