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

192 Commits

Author SHA1 Message Date
Stefan Fritsch
f4a5d6641f Only load the really imporant modules (i.e. those enabled by the 'few'
selection) by default. Don't handle modules enabled with --enable-foo
specially.

This fixes problems with module dependencies until someone implements a
mechanism for resolving module dependencies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200491 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:31:49 +00:00
Stefan Fritsch
9209ff117f Fix selection of loaded modules on AIX because its grep doesn't understand \< and \>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200064 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 00:41:20 +00:00
Rainer Jung
fc2ea4121c Load all modules in the generated default configuration
when using --enable-load-all-modules with configure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199467 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 21:25:28 +00:00
Stefan Fritsch
4a36c5ba4c By default, only load those modules that are either required
or explicitly selected by a configure --enable-foo argument. The
LoadModule statements for modules enabled by --enable-mods-shared=most
and friends will be commented out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199027 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 00:20:24 +00:00
Stefan Fritsch
03227ed1c4 Add some CFLAGS in maintainer mode if supported by gcc:
-Wformat
-Wformat-security
-Werror=format-security
-Werror=declaration-after-statement

Add new macro APACHE_ADD_GCC_CFLAGS to do the compatibility check.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180331 13f79535-47bb-0310-9956-ffa450edef68
2011-10-08 07:48:01 +00:00
Stefan Fritsch
b4c4a45339 Allow to explicitly disable modules even with module selection 'reallyall'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154875 13f79535-47bb-0310-9956-ffa450edef68
2011-08-08 08:50:50 +00:00
Kaspar Brand
2453c22a1a Enforce OpenSSL 0.9.7 as a minimum requirement in configure, and
remove #ifdef'ed code which was relevant for earlier versions only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154688 13f79535-47bb-0310-9956-ffa450edef68
2011-08-07 10:36:57 +00:00
Kaspar Brand
1eb818742f Drop support for the RSA BSAFE SSL-C toolkit from configure,
and remove #ifdef'ed code from mod_ssl and ab where applicable.

Consensus for dropping support for SSL/TLS toolkits other
than OpenSSL was reached on dev@httpd in June 2010 (message
with ID <20100602162310.GA11156@redhat.com> and follow-ups).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154683 13f79535-47bb-0310-9956-ffa450edef68
2011-08-07 10:29:09 +00:00
Stefan Fritsch
97abc9b6fd Simplify dependency checking code for mod_proxy_fdpass. This also fixes
mod_proxy_fdpass being built shared even with --enable-mods-static=reallyall.

Document bug/limitiation in APACHE_MODULE macro.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154126 13f79535-47bb-0310-9956-ffa450edef68
2011-08-05 08:45:28 +00:00
Stefan Fritsch
2d0c55080a Enable ldap modules in 'all' and 'most' selections if ldap is compiled into
apr-util


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154114 13f79535-47bb-0310-9956-ffa450edef68
2011-08-05 08:01:31 +00:00
Stefan Fritsch
5dd473c6d4 enable mod_ssl at level 'most'
Let's assume that if a system has the openssl dev headers installed in
the default location, it is very unlikely that crypto is forbidden in
the country that the system is located in.

If no ssl toolkit is found, disable mod_ssl instead of aborting.

The actual change is small, use 'diff -b' to review


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1150471 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 19:06:59 +00:00
Stefan Fritsch
2cbb6b5791 Don't fail if a module is selected for 'most' or 'all' but the dependencies
are not fulfilled


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1150464 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 18:56:17 +00:00
Rainer Jung
9ed2afa2b9 Tolerate dependency checking failures in configure
for modules that have been enabled only implicitely.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142892 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 05:31:22 +00:00
Rainer Jung
4158d7f272 Support reallyall option to configure also for
--enable-mods-static.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142623 13f79535-47bb-0310-9956-ffa450edef68
2011-07-04 11:06:14 +00:00
Jeff Trawick
2f4222c3d7 keep -DAP_HOOK_PROBES_ENABLED (--enable-hook-probes) and
-DAP_DECLARE_EXPORT (MinGW builds) out of the *CPPFLAGS
used for third-party module builds

introduce INTERNAL_CPPFLAGS for that; apxs bypasses this


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101211 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 20:34:42 +00:00
Guenter Knauf
aa028df962 Removed leftover from 2.0.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1025499 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 11:08:35 +00:00
Stefan Fritsch
9b851ec65e - Add reallyall option to configure to build everything that can be built with
the available libs.
- Remove redundant --with-distcache option. Simply enable distcache if
  mod_socache_dc is selected.
- Enable serf support by default if serf is available in /usr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956221 13f79535-47bb-0310-9956-ffa450edef68
2010-06-19 12:36:57 +00:00
Stefan Fritsch
ed06b71981 Fix MPM event/libserf build problems: If libserf was installed during build,
MPM event was picking up the headers but not linking with libserf, causing
unresolved symbol errors.

Now build MPM event with or without serf support depending on --with-serf
being specified or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954273 13f79535-47bb-0310-9956-ffa450edef68
2010-06-13 17:50:54 +00:00
Rainer Jung
e715e9cef2 make shared moduled and module set "most" the default.
Static building can be achieved with --enable-mods-static
or as previously using --enable-MODULE=static.
The existing --enable-mods-shared still works for
compatibility with existing build scripts.

Modules build with --with-module=... will still be build static.
For dynamic builds of external modules there is apxs.

The default set of modules os now "most". To build a small
set of modules use the new "few".

If APR doesn't support DSOs we fall back to static binding.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@952007 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 22:05:17 +00:00
Jeff Trawick
92224086cf fix VPATH builds, broken by the support for --enable-mpms-shared
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@880775 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 14:36:45 +00:00
Jeff Trawick
99d2822136 fix bad doc for an argument to APACHE_MPM_MODULE()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@836358 13f79535-47bb-0310-9956-ffa450edef68
2009-11-15 13:49:23 +00:00
Jeff Trawick
a9dcd4c693 Add a LoadModule directive for the default MPM to the conf file when building MPMs
as shared modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832778 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 15:55:10 +00:00
Jeff Trawick
d4e7b85b2f Change the configure-based MPM build mechanism to support building
an MPM as a shared shared or dynamic module, primarily using the
APACHE_MPM_MODULE() function.

--enable-mpms-shared now builds/installs the MPMs as dynamic modules.
(But no LoadModule directives are added.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832434 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 14:36:48 +00:00
Joe Orton
f67ffe3d58 Remove code to support per-dir-CA configuration which relies on a
function which was never included in OpenSSL:

* acinclude.m4: Remove test for fictional function.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Remove code.

* modules/ssl/ssl_engine_config.c (MODSSL_SET_CA): Remove unused
  macro.  (ssl_cmd_SSLCACertificatePath,
  ssl_cmd_SSLCACertificateFile): Fail if per-dir-CA is configured.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757380 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 11:45:00 +00:00
Justin Erenkrantz
f819de3ddf Make OpenSSL pkg-config usage consistent so that we don't run the early
configure checks against a /usr installed OpenSSL and then link against
a different pkg-config installed OpenSSL.

(Hint: Try with Mac OS X with MacPorts's OpenSSL or FreeBSD w/OpenSSL ports.)

* acinclude.m4
  (APACHE_CHECK_SSL_TOOLKIT): Load in pkg-config variables first before doing
  any OpenSSL checks so that we don't clobber things later.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730926 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 06:40:32 +00:00
Justin Erenkrantz
934553b954 Fix up SSL autoconf-fu so as not to emit bogus lines.
* acinclude.m4
  (APACHE_CHECK_SSL_TOOLKIT): Move CHECKING line to match; convert a warning
  to AC_MSG_WARN; remove a spurious SSL-C checking; redirect stderr from the
  pkgconfig so as not to spew on errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730914 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 05:34:52 +00:00
Rainer Jung
3bf1edc7d3 SSL libs are needed in linking only for ab and mod_ssl.
In both cases we already include SSL_LIBS, so lets add
the necessary link flags only to SSL_LIBS and not to
EXTRA_LDFLAGS.

The last of a series of changes of type
"restrict link dependencies where possible".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730883 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 01:14:33 +00:00
Ruediger Pluem
ed234afd2d * Correctly set SSL_LIBS during openssl detection if pkgconfig is not available.
PR: 46018


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@711993 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 22:23:21 +00:00
William A. Rowe Jr
9233cccaf1 This macro for SSL detection was altogether wrong. Refactoring
to restore the ability to build and link against a specified
--with-ssl[c]=path, including use of pkg-config variables which
were ignored during the autoconf test phase.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@669924 13f79535-47bb-0310-9956-ffa450edef68
2008-06-20 14:51:39 +00:00
Jim Jagielski
d82bc914ab Since we are using AC_CACHE_CHECK, avoid warning
about non-cached item by adding the required _cv_


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664701 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:32:04 +00:00
Guenter Knauf
06067c6be8 Enable to configure the https port - missing pieces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606806 13f79535-47bb-0310-9956-ffa450edef68
2007-12-25 20:02:55 +00:00
Justin Erenkrantz
1514ad3586 * acinclude.m4: When enabling a static library, ensure that the module's
dependent libraries are passed to the httpd link line.  Some supported
  versions of GNU libtool as well as APR's jlibtool do not bubble-up static
  library dependencies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@386792 13f79535-47bb-0310-9956-ffa450edef68
2006-03-18 02:26:19 +00:00
Joe Orton
6f768ff39b * acinclude.m4 (APACHE_CHECK_SSL_TOOLKIT): Add PKG_CONFIG_PATH for
specified OpenSSL location to avoid picking up system pkg-config
configuration.

PR: 38277


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378473 13f79535-47bb-0310-9956-ffa450edef68
2006-02-17 10:06:50 +00:00
Joe Orton
66bdf7b618 * acinclude.m4 (APACHE_ENABLE_MODULES): Support passing "none" to
--enable-modules to build an httpd with no optional modules enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357168 13f79535-47bb-0310-9956-ffa450edef68
2005-12-16 14:46:54 +00:00
Colm MacCarthaigh
e78c4186d6 Invert the "yes" and "no" values for $ap_void_ptr_lt_long, which
as Rudiger points out; are exactly wrong.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@294902 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 19:25:51 +00:00
Colm MacCarthaigh
4674da2cc7 One way or another, whether we leave the casts in or out, right now we are
using "void *" containers to store long integers; Add a configure-time check to
ensure that it is valid to assume that a "void *" container is large enough to
store a long int. See <200510031150.j93Boh700945@devsys.jaguNET.com> and
ensuing discussion on httpd-dev. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@294809 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 16:18:24 +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
Joe Orton
859e696860 * acinclude.m4 (APACHE_CHECK_APxVER): New macro, for checking
an apr/apu version requirement.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291972 13f79535-47bb-0310-9956-ffa450edef68
2005-09-27 14:57:24 +00:00
Joe Orton
84b6512fc8 * configure.in, acinclude.m4: Substitute AP[RU]_CONFIG with location
of installed ap[ru]-config scripts so third-party modules can use
`apxs -q APR_CONFIG`.

* support/apxs.in: Use new AP[RU]_CONFIG variables; use apr-config
--apr-libtool.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104641 13f79535-47bb-0310-9956-ffa450edef68
2004-08-13 09:38:11 +00:00
Justin Erenkrantz
252e7ae86c Teach apxs how to find ap{ru}-$AP{RU}_MAJOR_VERSION-config
(httpd-2.1+ will be APR 1.0 or higher which uses this convention.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104443 13f79535-47bb-0310-9956-ffa450edef68
2004-08-02 02:38:16 +00:00
Justin Erenkrantz
0d4387dedc Workaround RHEL 3 'cuteness' for OpenSSL by calling pkg-config openssl.
For more info, see: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=82369


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104329 13f79535-47bb-0310-9956-ffa450edef68
2004-07-19 04:27:13 +00:00
Joe Orton
8f26402223 * acinclude.m4 (APACHE_MODPATH_ADD): Give the convenience library a
less generic name; libtool 1.5 gets confused when linking libssl.la
against -lssl if libssl.la already exists in the cwd.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103164 13f79535-47bb-0310-9956-ffa450edef68
2004-03-26 09:58:34 +00:00
Joe Orton
15e2a44274 Fix use of mod_ssl as a DSO linked against static SSL libraries; also
stop linking all of support/* against the SSL libraries:

* acinclude.m4 (APACHE_MODULE): Define MOD_FOO_LDADD which each
module .la library will be linked against.
(APACHE_MODPATH_ADD): Link static modules against the provided libraries.
(APACHE_CHECK_SSL_TOOLKIT): Put SSL libraries in SSL_LIBS and export
that to config_vars.mk.

* support/Makefile.in: Link ab against SSL_LIBS.

* modules/ssl/config.m4: Add SSL_LIBS and distcache libraries to
MOD_SSL_LDADD.

PR: 17217


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102870 13f79535-47bb-0310-9956-ffa450edef68
2004-03-06 16:47:41 +00:00
Joe Orton
722d590399 Correct use of libtool: libtool convenience libraries which are to be
linked directly into a program must be linked using -static and not
-module.  Fixes build issues with libtool HEAD.

* acinclude.m4 (APACHE_MODPATH_ADD): For a static module, use a
filename with a lib prefix.

* build/rules.mk.in (MOD_LINK): Use -static not -module.

* build/special.mk (install-modules): Adjust special-case for
installation of shared modules to look for libso.la not mod_so.la.

* build/library.mk: Link libraries using -static.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102381 13f79535-47bb-0310-9956-ffa450edef68
2004-01-19 22:58:41 +00:00
Joe Orton
36b0d5753c * acinclude.m4 (APACHE_MODULE): Remove redundant $ac_n and $ac_c
variables.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102242 13f79535-47bb-0310-9956-ffa450edef68
2004-01-09 12:03:09 +00:00
Martin Kraemer
951681f855 Improve help for --enable-modules= and --enable-mods-shared= by showing the alternative 'all' and 'most' meta-module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102189 13f79535-47bb-0310-9956-ffa450edef68
2004-01-05 10:48:32 +00:00
Martin Kraemer
acd83dc569 Mention in the comment that we expect a _space_separated_ list of module
names. Translate '-' to '_' so that the shell does not complain about
invalid variable names.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102065 13f79535-47bb-0310-9956-ffa450edef68
2003-12-15 14:11:35 +00:00
Joe Orton
30333b82cc Use three-argument form of AC_DEFINE everywhere; remove acconfig.h
and the warning message from autoconf 2.5x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100540 13f79535-47bb-0310-9956-ffa450edef68
2003-07-10 19:29:24 +00:00
William A. Rowe Jr
fb9c4b137c Based on list discussion between myself and Geoff, it seems prudent
to check for both the existence of the openssl/engine.h header file
  and some 'expected function' such as ENGINE_init() (better suggestions
  are welcome.)  Also clear up some confusion; so long as we have
  ENGINE_load_builtin_engines() we should attempt to preload those.

  This patch protects all ENGINE-based code within the tests for the
  engine header and function, and changes a version test into a
  function test.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100104 13f79535-47bb-0310-9956-ffa450edef68
2003-05-30 18:41:53 +00:00
William A. Rowe Jr
da4aa113f8 Silly cut'n'paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100042 13f79535-47bb-0310-9956-ffa450edef68
2003-05-27 19:32:29 +00:00