1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

390 Commits

Author SHA1 Message Date
Joe Orton
a464e95bc9 * build/config_vars.sh.in: Check for the *-config scripts both at the
DESTDIR-relocated path and at the not-relocated path, to cope with
both builds with and without the bundled APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@330257 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 13:58:08 +00:00
Joe Orton
81a4bc28d1 * build/config_vars.sh.in: Prepend DESTDIR to paths to installed
apr/apu-config scripts.

Submitted by: Torsten Foertsch <torsten.foertsch gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@330246 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 12:59:59 +00:00
Justin Erenkrantz
efc39abf95 Remove install errors emitted when using jlibtool instead of GNU libtool.
(grep would skip this silently; but sed emits errors when no match is found.)

* build/instdso.sh: Protect sed calls with a test -s check to make sure
  that we're going to execute sed against a non-empty file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@292109 13f79535-47bb-0310-9956-ffa450edef68
2005-09-28 03:42:44 +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
Graham Leggett
b40eaaf3e1 Fix the RPM spec file: XML versions of the doc files are no
longer removed. Added httxt2dbm to the sbin directory.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240349 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 21:33:59 +00:00
Graham Leggett
27b516b966 Fixed complaints about unpackaged files within the RPM build
after changes to the config files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@208967 13f79535-47bb-0310-9956-ffa450edef68
2005-07-03 19:37:46 +00:00
Joe Orton
98693cedae * build/config_vars.sh.in: Expand LTFLAGS here, to fix apxs -q LIBTOOL
again.

PR: 32787
Submitted by: William Barker <william.barker wilshire.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190893 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 10:21:39 +00:00
Paul Querna
05b8e8b41e Delete the completely outdated httpd_roll_release script.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190659 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 21:23:31 +00:00
Joe Orton
9687f8c6a7 Update remaining 2004 copyright notices.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190592 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 13:54:34 +00:00
Joe Orton
f2f8515171 * configure.in: Define MKINSTALLDIRS and INSTALL in config_vars.mk.
Don't use AC_PROG_INSTALL since any system "install" command is never
used anyway.

* build/rules.mk.in: Remove fixed reference to install.sh and mkdir.sh
in abs_srcdir.

* build/config_vars.sh: Munge definitions of MKINSTALLDIRS and INSTALL
to use installed scripts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190396 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 13:19:42 +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
eab819d612 * 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
2005-06-08 16:07:46 +00:00
Joe Orton
32ed21c044 * build/instdso.sh: Extract LIBRARY_NAMES and DLNAME without using
grep; fix extraction of LIBRARY_NAMES which was sedding the wrong
variable name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@189595 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 15:37:55 +00:00
Bradley Nicholes
e9cac1b9d4 Disable some default LibC debugging code when compiling optimized
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@165340 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 21:14:21 +00:00
Bradley Nicholes
ed2db326a8 use BSD sockets when building for IPV6
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@162054 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 19:44:43 +00:00
Bradley Nicholes
e0128fb67f Build mod_ssl for the NetWare platform
Submitted by: Guenter Knauf <fuankg@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161813 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 23:18:10 +00:00
Bradley Nicholes
6905d3d9d5 Allow httpd on NetWare to build using either the standard socket libraries or the Winsock libraries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161368 13f79535-47bb-0310-9956-ffa450edef68
2005-04-14 23:42:21 +00:00
Bradley Nicholes
0034cf0091 Uncomment the secureListen directive when building the httpd-ssl.conf file for NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160952 13f79535-47bb-0310-9956-ffa450edef68
2005-04-11 21:06:42 +00:00
Bradley Nicholes
3247d60d76 Update the NetWare make install target to comply with the new .conf file layout
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160726 13f79535-47bb-0310-9956-ffa450edef68
2005-04-10 00:18:57 +00:00
Bradley Nicholes
564aeef123 Rethink the built-in vs shared modules for NetWare. Reposition mod_asis, mod_actions, mod_cgi, mod_imagemap, mod_userdir and mod_autoindex as shared rather than built-in.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160625 13f79535-47bb-0310-9956-ffa450edef68
2005-04-08 22:03:36 +00:00
Graham Leggett
3df7b5372c Add inverted commas to the build script parameter so that it works correctly when which outputs an empty string.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159479 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 12:45:23 +00:00
Bradley Nicholes
cd0d7bc36c Metrowerk compiler can't handle commas in the copyright string
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155276 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 23:15:43 +00:00
Justin Erenkrantz
7285403f84 * build/NWGNUtail.inc: Update license.
Submitted by: Guenter Knauf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155106 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 00:01:15 +00:00
Bradley Nicholes
8f55f1e45a One more NetWare tweak for the PCRE shakeup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153809 13f79535-47bb-0310-9956-ffa450edef68
2005-02-14 17:27:03 +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
Bradley Nicholes
6f6940dbaa Add a target to build the prebuild utilities on NetWare
Submitted by: Guenter Knauf <fuankg@apache.org> 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152957 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 23:17:38 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Joe Orton
81f2150298 * configure.in: Add --enable-pie flag; define PICFLAGS and PILDFLAGS.
* build/rules.mk.in: Factor out BASE_CC and BASE_CXX from COMPILE.
Substitute PICFLAGS into COMPILE and CXX_COMPILE, but not into
{SH,LT}{,_CXX}_COMPILE.  Substitute PILDFLAGS into LINK but not
{SH,MOD}_LINK.

Reviewed by: jerenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@126362 13f79535-47bb-0310-9956-ffa450edef68
2005-01-25 10:17:51 +00:00
Graham Leggett
ab4d018d62 Add a build script to create a solaris package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124104 13f79535-47bb-0310-9956-ffa450edef68
2005-01-04 13:38:11 +00:00
Graham Leggett
978429c50a Fix the RPM spec file so that an RPM build now works. An RPM
build now requires system installations of APR and APR-util.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@122711 13f79535-47bb-0310-9956-ffa450edef68
2004-12-18 09:53:10 +00:00
Bradley Nicholes
838eacc3db Change the names of the debug and release output build directories so they don't conflict with the modules/debug directory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@112041 13f79535-47bb-0310-9956-ffa450edef68
2004-12-15 22:40:41 +00:00
Bradley Nicholes
ad5121ecfc Clean up environment variables
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109693 13f79535-47bb-0310-9956-ffa450edef68
2004-12-03 15:49:31 +00:00
Bradley Nicholes
4433699079 Allow APR-UTIL to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109566 13f79535-47bb-0310-9956-ffa450edef68
2004-12-02 22:00:05 +00:00
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 00:12:39 +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
André Malo
3bc87d39db property cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106505 13f79535-47bb-0310-9956-ffa450edef68
2004-11-25 00:01:34 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
Bradley Nicholes
1dc216e2fe Fix a few references to mod_auth_ldap to be mod_authnz_ldap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104749 13f79535-47bb-0310-9956-ffa450edef68
2004-08-20 16:54:19 +00:00
Joe Orton
50deaf88cd Ignore config.* scripts copied from APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104543 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 10:21:07 +00:00
William A. Rowe Jr
e8f98f92d2 Moderize our .rc generation, using the license-2.0 text,
extracting copyright dates from the version header, and
  dropping a redundant s/./,/.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104295 13f79535-47bb-0310-9956-ffa450edef68
2004-07-15 00:29:43 +00:00
Joe Orton
454ae12192 * build/config.guess, build/config.sub: Remove since buildconf copies
these files from APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104269 13f79535-47bb-0310-9956-ffa450edef68
2004-07-13 11:26:44 +00:00
André Malo
2b4b012bb0 ignore copied PrintPath
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104152 13f79535-47bb-0310-9956-ffa450edef68
2004-07-03 16:20:15 +00:00
Graham Leggett
b21420c5a6 Add the NOTICE file to the rpm spec file in compliance with the Apache
v2.0 license.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104119 13f79535-47bb-0310-9956-ffa450edef68
2004-07-02 00:41:44 +00:00
Joe Orton
3a0915fcfe Remove build/PrintPath since buildconf copies it from APR already.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104105 13f79535-47bb-0310-9956-ffa450edef68
2004-07-01 09:37:47 +00:00
André Malo
7accf16eed Nobody objected:
<IfModule> now takes the module identifier in addition to the
filename.

CAUTION: this commit breaks the build on netware. It still needs
to be adjusted. (but I don't have any netware knowledge...)
Also, developers need to re-run buildconf on unices.

PR: 29003
Submitted by: Edward Rudd <eddie omegaware.com>, Andr� Malo


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103849 13f79535-47bb-0310-9956-ffa450edef68
2004-06-04 22:40:47 +00:00
Graham Leggett
069f909737 RPM spec file changes: changed default dependancy to link to db4
instead of db3. Fixed complaints about unpackaged files.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103704 13f79535-47bb-0310-9956-ffa450edef68
2004-05-20 18:59:57 +00:00
Bradley Nicholes
11d5f49be0 Add the installdev target to the help list
Submitted by: Guenter Knauf <fuankg@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103552 13f79535-47bb-0310-9956-ffa450edef68
2004-04-29 17:02:15 +00:00
Bradley Nicholes
8dc8b7cacd Remove the hardcoded /Y parameter when doing a xcopy
Submitted by: Guenter Knauf <fuankg@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103550 13f79535-47bb-0310-9956-ffa450edef68
2004-04-29 16:49:50 +00:00
Bradley Nicholes
77555ba72e Fix the XLFLAGS define in the NetWare makefiles so that the contents are added to the _link.opt file rather than the _link.def file
Submitted by: Guenter Knauf <gk@gknw.net>, Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103544 13f79535-47bb-0310-9956-ffa450edef68
2004-04-28 20:40:22 +00:00
Bradley Nicholes
6c3c47b7ef Add mod_version to the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103395 13f79535-47bb-0310-9956-ffa450edef68
2004-04-15 19:04:00 +00:00