summaryrefslogtreecommitdiff
path: root/acinclude.m4
Commit message (Collapse)AuthorAgeFilesLines
* Remove libsystemd dependency from main httpd binaryJoe Orton2022-04-121-1/+0
| | | | | | | | | | | | | | | Until this change httpd was linking libsystemd to the main httpd binary. If you want to run lightweight version of httpd in container, sometimes you just want to install httpd binary with as little dependencies as possible to make container small in size and do not pull uncencessary dependencies and libraries. This change will move all systemd library calls from listen.c to mod_systemd module and remove systemd linking from the main httpd bin. Fixed mixed declaration and wrongly declared variable. Submitted by: Luboš Uhliarik <luhliari redhat.com> Github: closes #312 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1899784 13f79535-47bb-0310-9956-ffa450edef68
* * acinclude.m4 (APACHE_CHECK_OPENSSL): Use standard "yes/no" outputJoe Orton2021-01-081-2/+2
| | | | | | | for the OpenSSL version check, rather than OK/FAILED. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1885269 13f79535-47bb-0310-9956-ffa450edef68
* Add a new way to document changesRuediger Pluem2020-07-131-0/+1
| | | | | | | | | | | | | | | | | * Makefile.in: Define the update-changes target to merge the change files from the changes directory to the top of the CHANGES file and remove them afterwards. If a Subversion binary was found during configure try to svn rm them otherwise just delete them. * configure.in: Search for the Subversion binary. * acinclude.m4: Set the corresponding Makefile variable for the Subversion binary. * README.CHANGES: New file to document the new approach. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879822 13f79535-47bb-0310-9956-ffa450edef68
* Revert r1876869 because on trunk server/listen.cRainer Jung2020-04-231-0/+1
| | | | | | | | also has a dependency on libsystemd. Thanks to jorton for pointing it out. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876873 13f79535-47bb-0310-9956-ffa450edef68
* systemd dependencies are only needed by mod_systemd.Rainer Jung2020-04-231-1/+0
| | | | | | | | | They should currently not be needed by httpd directly or any other binary. So no need to add them to HTTPD_LIBS. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876869 13f79535-47bb-0310-9956-ffa450edef68
* * acinclude.m4 (APACHE_CHECK_SYSTEMD): Remove redundant test.Joe Orton2020-03-121-1/+1
| | | | | | | | Submitted by: Pascal Terjan <pterjan linuxfr.org> PR: 57631 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875128 13f79535-47bb-0310-9956-ffa450edef68
* * modules/loggers/config.m4, modules/md/config2.m4, acinclude.m4:Joe Orton2020-01-141-2/+0
| | | | | | | | | | Correctly link mod_md and mod_log_json (and no other objects) against -ljansson. Removes unnecessary deps on libjansson from other linked objects, and fixes mod_md static build. (see https://travis-ci.org/apache/httpd/jobs/636789380) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872776 13f79535-47bb-0310-9956-ffa450edef68
* mod_ssl: use OPENSSL_init_ssl() to initialise OpenSSL on versions 1.1+.Graham Leggett2019-06-231-0/+1
| | | | | | | Reference: http://openssl.6102.n7.nabble.com/Shutting-down-openssl-is-the-correct-thing-to-do-nothing-td76857.html#a76862 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1861950 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in, acinclude.m4: Inline APACHE_GEN_MAKEFILES in AC_CONFIG_COMMANDSJoe Orton2019-06-211-6/+0
| | | | | | | and run during the "normal" phase of ./config.status rather than as init-cmds. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1861787 13f79535-47bb-0310-9956-ffa450edef68
* Define "state directory" for storing persistent child-writable state,Joe Orton2018-10-051-2/+2
| | | | | | | | | | | | | | | | | | with default from config.layout, configurable via DefaultStateDir. * server/core.c (set_state_dir, ap_state_dir_relative): New functions. * config.layout, acinclude.m4, Makefile.in, configure.in: Define statedir variables, drop davlockdb. * include/ap_config_layout.h.in: Define DEFAULT_REL_STATEDIR, DEFAULT_EXP_STATEDIR in place of _DAVLOCKDB. * include/ap_mmn.h: Bump MMN minor. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842929 13f79535-47bb-0310-9956-ffa450edef68
* * acinclude.m4 (APACHE_GEN_MAKEFILES): Respect configure --quiet by Joe Orton2018-07-101-1/+1
| | | | | | | sending fastgen output to the appropriate fd. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1835572 13f79535-47bb-0310-9956-ffa450edef68
* Allow openssl.pc to be in lib64 (like other components).Jean-Frederic Clere2018-06-271-6/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1834497 13f79535-47bb-0310-9956-ffa450edef68
* Move APACHE_CHECK_JANSSON m4 macro to general includes so additional modules ↵Paul Querna2018-04-231-0/+108
| | | | | | can use it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1829895 13f79535-47bb-0310-9956-ffa450edef68
* * support/Makefile.in, acinclude.m4: Add OpenSSL libraries at the end of theJoe Orton2017-11-281-2/+2
| | | | | | | ab link line, not the start. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1816534 13f79535-47bb-0310-9956-ffa450edef68
* Revert r1814940: serf-1 has a different API,Rainer Jung2017-11-111-4/+4
| | | | | | | so in order to support it more changes are necessary. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1814954 13f79535-47bb-0310-9956-ffa450edef68
* Look for serf-1 instead of serf-0 during configure.Rainer Jung2017-11-111-4/+4
| | | | | | | | Using a fixed major version might not be the best choice but using a fixed outdated one is even worse. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1814940 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1812263.Yann Ylavic2017-10-161-4/+8
| | | | | | | | | | | | As suggested by Joe, add --maintainer/debugger-mode's CFLAGS in NOTEST_CFLAGS to avoid interractions with autoconf's AC_LANG_PROGRAM. APACHE_ADD_GCC_CFLAG now also forces -Wno-strict-prototypes for -Werror to work despite AC_LANG_PROGRAM generating this warning by itself. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812301 13f79535-47bb-0310-9956-ffa450edef68
* PR60947: avoid CRYPTO_THREADID_set_callback() if possibleJacob Champion2017-04-181-1/+2
| | | | | | | | | | | | | | | | | | CRYPTO_THREADID_set_callback() is write-once, so if mod_ssl is unloaded and reloaded into a different address, we'll crash if OpenSSL wasn't also unloaded and reloaded at the same time. This can happen if another module or library is using OpenSSL as well. - OpenSSL 1.1.0 isn't affected. - Certain platforms (Windows, BeOS, and POSIX-compliant systems) can make use of the default THREADID callback in OpenSSL 1.0.x. - If the deprecated CRYPTO_set_id_callback() is available, we can use it instead of CRYPTO_THREADID_set_callback(). Otherwise, we have to fall back to CRYPTO_THREADID_set_callback(), but hopefully that applies to a small percentage of users at this point. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791732 13f79535-47bb-0310-9956-ffa450edef68
* configure: bump thread count for the &errno testJacob Champion2017-04-141-5/+9
| | | | | | Increase the number of threads from three to ten. Patch by rjung. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791309 13f79535-47bb-0310-9956-ffa450edef68
* configure: check if &errno is thread-local for OpenSSLJacob Champion2017-04-111-0/+135
| | | | | | | | | | | | This is step one for fixing, or at least mitigating, PR60947. Determine which platforms can use the default OpenSSL (1.0.x) threadid-callback, by recording the address of errno for several threads and testing that they're all different. The result of this test is put into the new macro, AP_OPENSSL_USE_ERRNO_THREADID. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791054 13f79535-47bb-0310-9956-ffa450edef68
* configure: remove orphaned APACHE_OUTPUT macroJacob Champion2016-07-181-7/+0
| | | | | | | The last use of APACHE_OUTPUT appears to have been removed back in r87231. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1753316 13f79535-47bb-0310-9956-ffa450edef68
* Small change to r952007, ensure we don't wipe out the $enable_foomod valueWilliam A. Rowe Jr2016-06-281-1/+0
| | | | | | | | | when that value is 'shared'. The 'yes', 'shared', 'static' and 'no' values are all valid. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750553 13f79535-47bb-0310-9956-ffa450edef68
* This is not C code... no semi, a colon is a noopWilliam A. Rowe Jr2016-06-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750420 13f79535-47bb-0310-9956-ffa450edef68
* Undo r1750418, miscommitted a local testWilliam A. Rowe Jr2016-06-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750419 13f79535-47bb-0310-9956-ffa450edef68
* This isn't C ;) Colon for noopWilliam A. Rowe Jr2016-06-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750418 13f79535-47bb-0310-9956-ffa450edef68
* Account for explicit enable- cases of 'shared', 'few', 'all', 'reallyall'William A. Rowe Jr2016-06-271-7/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750407 13f79535-47bb-0310-9956-ffa450edef68
* Ensure not-selected means 'no', once an APACHE_MODULE enable_foo is processedWilliam A. Rowe Jr2016-06-271-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750335 13f79535-47bb-0310-9956-ffa450edef68
* Promote any static module to yes|shared if a required dependency is not staticWilliam A. Rowe Jr2016-06-231-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1749925 13f79535-47bb-0310-9956-ffa450edef68
* Support multiple module dependencies for the final prereq argument to theWilliam A. Rowe Jr2016-06-221-5/+6
| | | | | | | | | | | APACHE_MODULE macro, as a comma separated list, e.g. APACHE_MODULE(proxy_http2, [...], [proxy,http2]) will evaluate the availability of mod_proxy, followed by mod_http2 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1749658 13f79535-47bb-0310-9956-ffa450edef68
* Use different variables to track normalRainer Jung2016-02-121-2/+4
| | | | | | | | | | | | | | | | modules and MPMs during build. Normal modules and MPMs follow different rules in the config, e.g. we are only allowed to have one active LoadModule for an MPM in the config. As a side effect, LoadModule for MPMs will now come before LoadModule for the normal modules. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730079 13f79535-47bb-0310-9956-ffa450edef68
* Support for OpenSSL 1.1.0:Rainer Jung2016-02-071-1/+1
| | | | | | | | | | | | | - don't check for SSLeay_version() in configure The function no longer exists in 1.1.0. It was replaced by OpenSSL_version(). - Switch between SSLeay_version(U) and OpenSSL_version() depending on version in modules/ssl/ssl_util_ssl.h. - Use MODSSL_LIBRARY_DYNTEXT everywhere. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728981 13f79535-47bb-0310-9956-ffa450edef68
* * Since r1724820 two modules, mod_http2 and mod_ssl, call APACHE_CHECK_OPENSSL,Ruediger Pluem2016-01-181-0/+8
| | | | | | | | | | | | | with mod_http2 doing it first. Because the result of APACHE_CHECK_OPENSSL is cached this causes MOD_LDFLAGS and MOD_CFLAGS to remain unset for mod_ssl which in turn causes it not to be linked against Openssl which means that mod_ssl cannot be loaded if the Openssl libs haven't been loaded by other means already. Fix this by caching the values for MOD_LDFLAGS and MOD_CFLAGS created during the first run and set them in the cached case. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725325 13f79535-47bb-0310-9956-ffa450edef68
* m4: please any autoconf by quoting AC_DEFUN's names. PR 58126.Yann Ylavic2015-10-051-20/+20
| | | | | | | Submitted by: olli hauer <ohauer gmx.de> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706918 13f79535-47bb-0310-9956-ffa450edef68
* httpd compiles warning free on gcc and every new warning will be treated as ↵Stefan Eissing2015-09-141-1/+1
| | | | | | an error, standard c-89 is enforced git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1702948 13f79535-47bb-0310-9956-ffa450edef68
* moving m4 mod_h2 macro from global to module local configStefan Eissing2015-08-271-121/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698103 13f79535-47bb-0310-9956-ffa450edef68
* Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -qEric Covener2015-08-031-0/+2
| | | | | | | | | | | | PR58202. Submitted By: Daniel Shahaf Committed By: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1693919 13f79535-47bb-0310-9956-ffa450edef68
* reworked mod_h2 donation checkin into build system, added documentationStefan Eissing2015-07-101-0/+121
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1690248 13f79535-47bb-0310-9956-ffa450edef68
* mod_ssl: Check for RAND_egd() at configure time and only use it if present.Stefan Sperling2015-04-181-1/+1
| | | | | | | | | | Fixes the build with LibreSSL which does not provide this function. Submitted by: Bernard Spil <pil.oss gmail com>, stsp Committed by: stsp git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674542 13f79535-47bb-0310-9956-ffa450edef68
* * mod_dav_fs: set default value of DavLockDB using installation layoutJan Kaluža2015-04-171-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674222 13f79535-47bb-0310-9956-ffa450edef68
* Generate #LoadModule directive in default httpd.conf for every ↵Yann Ylavic2015-01-191-1/+1
| | | | | | | | | | --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
* * acinclude.m4 (APACHE_CHECK_SYSTEMD): Actually use $PKGCONFIG, duh.Joe Orton2014-07-311-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1614824 13f79535-47bb-0310-9956-ffa450edef68
* * acinclude.m4 (APACHE_CHECK_SYSTEMD): Check first for libsystemdJoe Orton2014-07-311-1/+3
| | | | | | | 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
* * configure.in, acinclude.m4: Move systemd check to APACHE_CHECK_SYSTEMDJoe Orton2014-07-311-0/+21
| | | | | | | and use pkg-config where available. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1614821 13f79535-47bb-0310-9956-ffa450edef68
* Increase minimum required OpenSSL version to 0.9.8a (in preparationKaspar Brand2013-09-291-2/+2
| | | | | | | | | | | | | | | | | | | 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
* mod_ssl/ab: only use "--static" for pkg-config when explicity requestedKaspar Brand2013-01-051-3/+8
| | | | | | | (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
* Improve pkg-config usage for mod_ssl/ab:Kaspar Brand2013-01-031-3/+6
| | | | | | | | | | | | | | | | | | 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
* Follow on to r1393976 and r1396424:Jeff Trawick2012-10-101-10/+3
| | | | | | | | | | | | | | 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
* Fix usage of MOD_* variables for MPM modulesStefan Fritsch2012-10-071-2/+23
| | | | | | | | | | | | | | 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
* Spin off module-specific build options into separate build vars.Kaspar Brand2012-09-161-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | [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
* revert r1358167, in preparation of the next commitKaspar Brand2012-09-161-43/+30
| | | | | | | (will give a more meaningful diff) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1385213 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status