1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

210 Commits

Author SHA1 Message Date
Yann Ylavic
07605b2bad Generate #LoadModule directive in default httpd.conf for every --enable-mpms-shared. PR 53882.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652930 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 08:14:48 +00:00
Joe Orton
695d4cdd5d * acinclude.m4 (APACHE_CHECK_SYSTEMD): Actually use $PKGCONFIG, duh.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1614824 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 08:06:22 +00:00
Joe Orton
81eecb045b * acinclude.m4 (APACHE_CHECK_SYSTEMD): Check first for libsystemd
with pkg-config since libsystemd-daemon is deprecated upstream.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1614823 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 08:01:07 +00:00
Joe Orton
d91f672d4f * configure.in, acinclude.m4: Move systemd check to APACHE_CHECK_SYSTEMD
and use pkg-config where available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1614821 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 07:56:44 +00:00
Kaspar Brand
725978c554 Increase minimum required OpenSSL version to 0.9.8a (in preparation
for the next mod_ssl commit, which will rely on the get_rfcX_prime_Y
functions added in that release):

- remove obsolete #defines / macros

- in ssl_private.h, regroup definitions based on whether
  they depend on TLS extension support or not

- for ECC and SRP support, set HAVE_X and change the rather awkward
  #ifndef OPENSSL_NO_X lines accordingly

For the discussion prior to taking this step, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%3C524275C7.9060408%40velox.ch%3E


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1527294 13f79535-47bb-0310-9956-ffa450edef68
2013-09-29 10:12:47 +00:00
Kaspar Brand
9c396d2432 mod_ssl/ab: only use "--static" for pkg-config when explicity requested
(by adding an "--enable-ssl-staticlib-deps" option to configure)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1429228 13f79535-47bb-0310-9956-ffa450edef68
2013-01-05 07:54:15 +00:00
Kaspar Brand
78096fee34 Improve pkg-config usage for mod_ssl/ab:
also use pkg-config for determining the -l flags (and fall back
to a hardcoded default of "-lssl -lcrypto")

add --static to pkg-config invocations, so that libraries for
static linking are also taken into account (PR 54252 - note that
the additional flags will only appear in modules/ssl/modules.mk
and ab_LDFLAGS, so potential side effects are limited)

separate --libs-only-L and --libs-only-other into two invocations
(can't be used concurrently, only the first takes effect)

use --silence-errors where applicable


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1428184 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 07:23:27 +00:00
Jeff Trawick
864d3d0d87 Follow on to r1393976 and r1396424:
mod_systemd: Specify "all" instead of "yes" (on Unix) so that APACHE_MODULE doesn't
             act as if the user requested it.

General: Fix APACHE_MODULE so that failed prereqs will disable a module unless the
         user requested it explicitly.

Result: By default systemd will be enabled where it actually works and disabled otherwise,
        but if the user requests it and the prereqs fail then configure will halt.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1396440 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 01:04:36 +00:00
Stefan Fritsch
67fde08ec7 Fix usage of MOD_* variables for MPM modules
r1385216 broke building of mpm event with serf support. To fix,

* introduce APACHE_MPMPATH_INIT/FINISH similar to
  APACHE_MODPATH_INIT/FINISH to create modules.mk and add
  MOD_* vars to it.
* change APACHE_MPM_MODULE to only append to modules.mk, not
  overwrite
* add APACHE_MPMPATH_INIT/FINISH to all MPMs


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395252 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 08:56:45 +00:00
Kaspar Brand
089f0eb0ac Spin off module-specific build options into separate build vars.
[second try, supersedes r1385214]

Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,
which are available to modules for customization on a per-subdir
basis (by adding definitions to modules.mk). Reduces the risk
of side-effects when a module needs to add CFLAGS, LDFLAGS etc.
and these would be added to the global settings (ALL_CFLAGS etc.).

Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,
mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx
build variables.

Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead
of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce
ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where
they appear at the proper position in the build commands.

Consistently use "--with-xxx=PATH" in configure help strings which
are used to specify a path to the installation directory of an
auxiliary package.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1385216 13f79535-47bb-0310-9956-ffa450edef68
2012-09-16 06:19:13 +00:00
Kaspar Brand
5b09bf5772 revert r1358167, in preparation of the next commit
(will give a more meaningful diff)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1385213 13f79535-47bb-0310-9956-ffa450edef68
2012-09-16 05:54:16 +00:00
Ben Laurie
bb1777a1f9 Work correctly with a development version of OpenSSL. I suspect
something similar is needed when there are two OpenSSL installations,
one in a default location.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1358167 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 12:41:10 +00:00
Joe Orton
0eb81d4acc * acinclude.m4: Use AC_MSG_NOTICE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1341906 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 15:42:56 +00:00
Guenter Knauf
3af055354f Avoid AC_TRY_RUN break with cross-compile.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1328445 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 16:40:30 +00:00
Guenter Knauf
46b607a2a4 Next step to make cross compilation a bit easier.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1328390 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 14:51:21 +00:00
Stefan Fritsch
c6e601be12 Improve indentation, no code change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234565 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 18:27:11 +00:00
Stefan Fritsch
21cc07a470 Make APACHE_MODULE() accept an optional prerequisite module for configure.
Introduce the following configure time dependencies:
  mod_proxy_* (except proxy_html) require mod_proxy
  mod_dav_* require mod_dav
  mod_session_* require mod_session


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234180 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 22:14:31 +00:00
Joe Orton
80765aa7fe A stab at libapreq build integration, still disabled by default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200715 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 03:01:33 +00:00
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