summaryrefslogtreecommitdiff
path: root/acinclude.m4
Commit message (Collapse)AuthorAgeFilesLines
* * Revert breakage to ssl detection; while ssl libs were onlyRuediger Pluem2008-01-071-10/+2
| | | | | | | | | | linked for ab, mod_ssl in 2.0.62, the choice of libs were broken. Patch to 2.0 (applicable to no other branch); Reviewed by: wrowe, sctemme, rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@609625 13f79535-47bb-0310-9956-ffa450edef68
* * Backport 102870; PR 17217; stop linking OpenSSL .so's to support/*Jim Jagielski2007-12-281-4/+17
| | | | | | | | | | | | | | binaries (especially when compiled --with-static-support (!)) and fix mod_ssl.so to compile against .a openssl archives. http://svn.apache.org/viewcvs.cgi?rev=102870&view=rev adjusted patch without distcache complexity and accomodating the changes for pkgconfig info from ssl http://people.apache.org/~wrowe/httpd-2.0-limit-ssl-binding.patch +1: wrowe, colm, rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@607260 13f79535-47bb-0310-9956-ffa450edef68
* Backport from HEAD:Joe Orton2004-08-231-0/+7
| | | | | | | | | | | | | | | | | | * acinclude.m4: Pick up OpenSSL libs/cflags from pkg-config. * modules/ssl/ssl_engine_io.c (ssl_io_input_read): Fix potential infinite loop in ssl_io_input_getline if connection is aborted without inctx->rc being set. * modules/ssl/ssl_scache_shmcb.c (ssl_scache_shmcb_init): Use an anonymous shm segment by default or fall back on name-based shm. PR: 18989, 21335, 29964 Submitted by: jerenkrantz, jorton Reviewed by: jerenkrantz, trawick, jorton, nd, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104768 13f79535-47bb-0310-9956-ffa450edef68
* Back-port changes to allow build without an in-tree apr and apr-util.Wilfredo Sanchez2002-11-291-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@97677 13f79535-47bb-0310-9956-ffa450edef68
* Add --[enable|disable]-v4-mapped configure option to controlJeff Trawick2002-11-141-0/+2
| | | | | | | | | | | | | | | | | | whether or not Apache expects to handle IPv4 connections on IPv6 listening sockets. Either setting will work on systems with the IPV6_V6ONLY socket option. --enable-v4-mapped must be used on systems that always allow IPv4 connections on IPv6 listening sockets. Note: As the ssl config file is not automatically generated and it is expected to require editing anyway to work, the only change there was to suggest the required Listen statements in a comment. PR: PR 14037 (Bugzilla), PR 7492 (Gnats), various dups of these PRs git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97516 13f79535-47bb-0310-9956-ffa450edef68
* Rework the apxs -cp command to work when the source dir isn't available byJustin Erenkrantz2002-09-191-0/+2
| | | | | | | | | | | querying apr-config and apu-config at link-time instead. (Note that the $apr_config value in configure.in isn't sufficient as we need to know where apr-config will be when we execute apxs later on - hence the --bindir option to apr-config and apu-config.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96905 13f79535-47bb-0310-9956-ffa450edef68
* Update OpenSSL detection to work on Darwin.Justin Erenkrantz2002-09-091-1/+1
| | | | | | | | Submitted by: Sander Temme <sctemme@covalent.net> Reviewed by: Dirk, Justin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96726 13f79535-47bb-0310-9956-ffa450edef68
* Use APR_PARSE_ARGUMENTS instead of APACHE_PARSE_ARGUMENTSJustin Erenkrantz2002-08-191-122/+0
| | | | | | | | Submitted by: Thom May <thom@planetarytramp.net> Reviewed by: Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96441 13f79535-47bb-0310-9956-ffa450edef68
* APACHE_LAYOUT_DEFAULTS was unused. nuke it.Greg Stein2002-08-141-19/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96377 13f79535-47bb-0310-9956-ffa450edef68
* Modified version check on openssl so that it finds the executableRoy T. Fielding2002-08-101-19/+24
| | | | | | | | | | | first and then performs a check of the version, only warning the user if they chose, or we selected, an old version of OpenSSL. This change also allows the code to work for non-openssl libraries selected via the --with-ssl=dir option, which can override the automated library check in any case. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96345 13f79535-47bb-0310-9956-ffa450edef68
* Check for OpenSSL 0.9.6e or higherSander Striker2002-08-091-2/+2
| | | | | | | Submitted by: Mathihalli Madhusudan <madhusudan_mathihalli@hp.com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96328 13f79535-47bb-0310-9956-ffa450edef68
* Look for OpenSSL libraries in /usr/lib64.Justin Erenkrantz2002-07-161-1/+1
| | | | | | | | Submitted by: Peter Poeml <poeml@suse.de> Reviewed by: Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96084 13f79535-47bb-0310-9956-ffa450edef68
* Remove APACHE_MKDIR_P_CHECK in favor of new APR_MKDIR_P_CHECK.Justin Erenkrantz2002-05-141-20/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95082 13f79535-47bb-0310-9956-ffa450edef68
* Move the mkdir_p check outside of the cache check so that we will alwaysJustin Erenkrantz2002-04-181-2/+5
| | | | | | | set that variable. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94699 13f79535-47bb-0310-9956-ffa450edef68
* Allow VPATH builds to succeed when configured from an empty directory.Justin Erenkrantz2002-04-181-6/+2
| | | | | | | | | | (Justin removed some unneeded changes in Makefile.in.) Submitted by: Thom May <thom@planetarytramp.net> Reviewed by: Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94697 13f79535-47bb-0310-9956-ffa450edef68
* Generate rel_libdir and exp_libdir variables.Aaron Bannert2002-04-061-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94512 13f79535-47bb-0310-9956-ffa450edef68
* Allow us to override the default --libdir from the config.layoutAaron Bannert2002-04-061-1/+1
| | | | | | | | | | if it was specified to configure. Submitted by: Thom May <thom@planetarytramp.net> Reviewed by: Aaron Bannert git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94511 13f79535-47bb-0310-9956-ffa450edef68
* Ensure that the build directory is created when using VPATH.Justin Erenkrantz2002-03-261-0/+6
| | | | | | | | Previously, configure would try to write config_vars.mk into build without ensuring that that directory existed first. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94188 13f79535-47bb-0310-9956-ffa450edef68
* Added exp_foo and rel_foo variables to config_vars.mk for all Apache andAaron Bannert2002-03-211-0/+35
| | | | | | | | | | | | | | | Autoconf path variables (like --sysconfdir, --sbindir, etc). exp_foo is the "expanded" version, which means that all internal variable references have been interpolated. rel_foo is the same as $exp_foo, only relative to $prefix if they share a common path. This will be used in apxs.in and apachectl.in to allow Apache installs to be relocated as long as the same relative directory structure remains. Currently this is only possible if you use the Apache layout, but not with other layouts or any overridden --foodir paths. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94108 13f79535-47bb-0310-9956-ffa450edef68
* Allow spaces in the --prefix-like arguments.Aaron Bannert2002-03-211-13/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94107 13f79535-47bb-0310-9956-ffa450edef68
* OS/390: install apachecore.[dll|x] in lib/ rather than bin/ .Greg Ames2002-03-201-0/+1
| | | | | | | | | The LIBPATH env var already must contain the path to lib/ in order to pick up apr and apr-util. If we install the core dll there as well, LIBPATH becomes simpler. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94053 13f79535-47bb-0310-9956-ffa450edef68
* Fix a comment about the /<target> appended to config.layout variablesAaron Bannert2002-03-141-1/+1
| | | | | | | | | | postpended with a '+' character. We don't currently support --target (and as Thom pointed out, --target means something completely different to Autoconf). Also change the default for '+' replacement to 'apache2' so 1.3 and 2.0 can coexist on such distributions. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93936 13f79535-47bb-0310-9956-ffa450edef68
* Fix apxs -g handling.Jeff Trawick2002-03-141-2/+2
| | | | | | | | | | | | Move config_vars.mk from the top build directory to the build directory. Get build/rules.mk cleaned up for distclean/extraclean. PR: 10163 (This is the 2nd of two commits for that PR. The first was to apxs.in -- rev 1.35.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93923 13f79535-47bb-0310-9956-ffa450edef68
* Fix a problem in the new --enable-layout functionality whereAaron Bannert2002-03-061-0/+139
| | | | | | | | | | | | it wouldn't allow overrides from variables like --prefix, --bindir, etc. Obtained from: Partly from an autoconf-generated configure script. Submitted by: Thom May <thom@planetarytramp.net> Reviewed by: Aaron Bannert, Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93738 13f79535-47bb-0310-9956-ffa450edef68
* Fix a typo in the default cgidir variable.Aaron Bannert2002-02-281-2/+5
| | | | | | | | Set a couple more defaults if they haven't already been set, just as a precaution. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93618 13f79535-47bb-0310-9956-ffa450edef68
* Set defaults for non-autoconf path variables. Also export a coupleAaron Bannert2002-02-271-0/+20
| | | | | | | | | | | | | variables that for whatever reason weren't being placed into config_vars.mk. Warning: This commit alters the "default" layout (ie. when no --enable-layout is specified). The most notable change will be htdocs in $prefix/share/htdocs, which works with the autoconf defaults, but may not be what we want. This will require more work. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93605 13f79535-47bb-0310-9956-ffa450edef68
* Fix --enable-layout to work again.Aaron Bannert2002-02-271-17/+0
| | | | | | | | | | | | | | | Fix bug where --sysconfdir and --localstatedir were being ignored by APR. Caution: When specifying --enable-layout, common arguments like --prefix, --exec-prefix, etc. will be ignored and the settings from the layout will be used instead. PR: 9124, 9888, 9873, 9885 Submitted by: Thom May <thom@planetarytramp.net>, Aaron Bannert Reviewed by: Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93598 13f79535-47bb-0310-9956-ffa450edef68
* fix some problems with variables in config_vars.mkJeff Trawick2002-02-261-1/+1
| | | | | | | | Submitted by: Aaron Bannert Tested by: Jeff Trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93581 13f79535-47bb-0310-9956-ffa450edef68
* mod_ssl adjustments to help with using toolkits other than OpenSSL:Doug MacEachern2002-01-101-0/+3
| | | | | | | | | | | | | | Use SSL functions/macros instead of directly dereferencing SSL structures wherever possible. Add type-casts for the cases where functions return a generic pointer. Add $SSL/include to configure search path. PR: Obtained from: Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com> Reviewed by: dougm git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92800 13f79535-47bb-0310-9956-ffa450edef68
* The -L and -R flags are linker flags not libraries. We need to add them toJustin Erenkrantz2002-01-061-2/+2
| | | | | | | the correct variable (LDFLAGS) so we can fix 'em up later on. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92759 13f79535-47bb-0310-9956-ffa450edef68
* OS/2: Supply the configured libraries to the linker when building loadableBrian Havard2001-12-301-0/+1
| | | | | | | modules. This allows things like mod_deflate to build (needs -lz). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92663 13f79535-47bb-0310-9956-ffa450edef68
* change Apache/apr/apr-util to use run-time linking on AIXJeff Trawick2001-12-121-0/+1
| | | | | | | | | | currently, a kludge (-uXML_Parse) is needed to get a reference to expat in the Apache executable programs; I think this is related to the fact that expat libtool is getting generated a little differently than apr libtool and is choosing to build a different flavor of shared library git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92435 13f79535-47bb-0310-9956-ffa450edef68
* Fix the installation target to make sure that the manual isRyan Bloom2001-11-241-1/+1
| | | | | | | | | | | installed in the correct location. PR: 8851 Submitted by: Yoshifumi Hiramatsu <hiramatu@boreas.dti.ne.jp> and Gomez Henri <hgomez@slib.fr> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92164 13f79535-47bb-0310-9956-ffa450edef68
* Fix a typo in the configure script. The argument is --enable-mods-shared,Ryan Bloom2001-10-111-1/+1
| | | | | | | but we documented it as --enable-mod-shared. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91418 13f79535-47bb-0310-9956-ffa450edef68
* Fixed the configure script to add a LoadModule directive toRyan Bloom2001-10-111-1/+4
| | | | | | | | | | the default httpd.conf for any module that was compiled as a DSO. Submitted by: Aaron Bannert <aaron@clove.org> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91415 13f79535-47bb-0310-9956-ffa450edef68
* Fix --enable-mods-shared processing. If most is specified,Ryan Bloom2001-10-031-6/+12
| | | | | | | | | | | then all modules that can be compiled as shared modules are. This was done by adding a module config specifier, static, which denotes that a module can not be compiled as a DSO. Submitted by: Aaron Bannert <aaron@clove.org> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91262 13f79535-47bb-0310-9956-ffa450edef68
* Kill two autoconf-related birds with one commit.Justin Erenkrantz2001-09-301-6/+13
| | | | | | | | | | | | | | | | | | | | | | - substr used in APACHE_MODULE for the help string did not parse correctly with autoconf 2.50+ so we had to punt there anyway and use AC_HELP_STRING. - Add APACHE_HELP_STRING define that will call AC_HELP_STRING on 2.50+ (actually not 2.13 - look at the regex call) or do our custom variation of it. This function can't have any extra spaces or it will be returned in the help string. So noted. If anyone can figure out how to insert a line break like 2.50+ does when we go over the 26th column, I'd appreciate it. I tried and I'm way too tired to figure it out now. Adding this would greatly simplify two or three HELP_STRING uses. - Switch all of those annoying WITH and ENABLE functions to use the APACHE_HELP_STRING. This makes everything consistent now. I've always had to go through and keep aligning everything every few months or so because I'm the only one who cares. No more. I refuse to do it any more! Use APACHE_HELP_STRING or be crucified. Looks decent with autoconf-2.13 and autoconf-2.52. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91211 13f79535-47bb-0310-9956-ffa450edef68
* work around an AIX "issue" in the construction of config_vars.mk byJeff Trawick2001-09-061-1/+1
| | | | | | | | | | | | | | | | | | modifying the sed expression just a bit; note that before and after this change manualdir isn't being handled properly; using the default Apache layout we get manualdir = $datadir/manual instead of manualdir = $(datadir)/manual Submitted by: Victor Orlikowski, after I narrowed down the issue git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90930 13f79535-47bb-0310-9956-ffa450edef68
* If the user doesn't specify a layout, then just use the ApacheRyan Bloom2001-09-041-16/+2
| | | | | | | | layout. This means that we don't have to re-specify options that are already in config.layout. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90895 13f79535-47bb-0310-9956-ffa450edef68
* My first try at relocating the manual tree outside of the htdocs/ directory.Martin Kraemer2001-08-231-0/+2
| | | | | | | | | | | | | It will now reside in the ServerRoot, alongside with .../man/ and .../icons/ and .../htdocs/ - Please review the config.layout entries for the vendor specific entries, I supplied sensible defaults but you may disagree. Reviewed by: William A. Rowe, Jr., Joshua Slive, Rich Bowen git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90551 13f79535-47bb-0310-9956-ffa450edef68
* We always need to include the openssl specific directory in the INCLUDESRyan Bloom2001-08-221-1/+2
| | | | | | | variable. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90508 13f79535-47bb-0310-9956-ffa450edef68
* In absence of an explicit --with-ssl= path,Martin Kraemer2001-08-221-1/+1
| | | | | | | use the PATH order before trying hard-coded /usr/local paths git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90489 13f79535-47bb-0310-9956-ffa450edef68
* Add the openssl/include/openssl directory to the INCLUDES variable.Ryan Bloom2001-08-201-1/+1
| | | | | | | | | This allows us to remove the openssl from the #include lines in the mod_ssl files. This makes it easier to use a different SSL library, with fewer changes to the mod_ssl files. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90435 13f79535-47bb-0310-9956-ffa450edef68
* catch up with errordir. Modeled simply after iconsdir, hope that does it.William A. Rowe Jr2001-08-201-2/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90411 13f79535-47bb-0310-9956-ffa450edef68
* Extend 'openssl' search to the directories from PATHMartin Kraemer2001-08-201-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90397 13f79535-47bb-0310-9956-ffa450edef68
* Per discussion on new-httpd, change the logic to do the following:Justin Erenkrantz2001-08-191-1/+12
| | | | | | | | | | --enable-modules=most will disable a module if it can not be built --enable-modules=all will error if a module can not be built --enable-modules=foo will error if the specified module can not be built (even if --enable-modules=most is set) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90360 13f79535-47bb-0310-9956-ffa450edef68
* Fix --enable-modules=all breakage with mod_auth_db and mod_auth_digestJustin Erenkrantz2001-08-171-1/+10
| | | | | | | | | | | | by allowing a module to disable itself if its prerequisites are not met. This introduces the subtle nuance that if you request a module and you don't meet its prerequisites, it'll refuse to build itself. mod_ssl exits if its prerequisites are not met. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90261 13f79535-47bb-0310-9956-ffa450edef68
* Install all build/*.mk when we install Apache. This is the first stepRyan Bloom2001-07-301-1/+3
| | | | | | | to getting apxs to use the same makefiles as Apache. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89776 13f79535-47bb-0310-9956-ffa450edef68
* install the man pages when we install everything else.Ryan Bloom2001-07-051-0/+2
| | | | | | | PR: 7754 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89500 13f79535-47bb-0310-9956-ffa450edef68
* Change the make targets and rules to be consistent in all of theRoy T. Fielding2001-05-181-0/+3
| | | | | | | Apache-owned source trees. Sanity is a good thing. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89140 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status