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

161 Commits

Author SHA1 Message Date
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
William A. Rowe Jr
c7780d9b8d Clean up the OpenSSL/SSL-C tests...
OpenSSL must remain a 'higher priority' than picking up sslc headers
  (especially since openssl headers are clearly namespace decorated.)

  Introduce a --with-sslc flavor to override this priority ordering.

  Test the now-current safe flavors of OpenSSL/SSL-C (which gets tricky
  with OpenSSL 0.9.6j/0.9.7b safe flavors.)

  Reorder variables restoration to preceed error reporting/failure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100040 13f79535-47bb-0310-9956-ffa450edef68
2003-05-27 19:11:34 +00:00
William A. Rowe Jr
bf7a2291a5 Any library could benefit from SSL_set_cert_store(), if the library
sources have been patched.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100039 13f79535-47bb-0310-9956-ffa450edef68
2003-05-27 17:02:44 +00:00
William A. Rowe Jr
64bce979cb As Geoff Thorpe <geoff@geoffthorpe.net> points out, we must perform our
compilation tests for the SSL_has_foo functions while we have completely
  populated the config with 'standard' libraries from our apr configuration.

  This allows us to compile more complex dependencies such as the test for
  ENGINE_init(), which also requires -lsockets etc on Solaris for any
  static build of OpenSSL.  If this fails, we will have to research using
  the pkgconfig/openssl.pc configuration to perform these precompile tests.

  This restores the various HAVE_SSL_{FOO} macros for SSL-C and introduced
  the proper test for HAVE_ENGINE_INIT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100038 13f79535-47bb-0310-9956-ffa450edef68
2003-05-27 16:53:54 +00:00
Justin Erenkrantz
5382f453f0 Fix tpyo in APACHE_CHECK_SSL_TOOLKIT for ap_platform_runtime_link_flag case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99149 13f79535-47bb-0310-9956-ffa450edef68
2003-03-31 21:19:07 +00:00
Madhusudan Mathihalli
c686e1d070 Modify the APACHE_CHECK_SSL_TOOLKIT to detect SSL-C (atleast version 2.1).
Submitted by: Madhusudan Mathihalli


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99000 13f79535-47bb-0310-9956-ffa450edef68
2003-03-13 20:42:06 +00:00
Madhusudan Mathihalli
434aab19d0 Replace the APACHE_CHECK_SSL_TOOLKIT method with a cleaner one, using
autoconf tools (AC_CHECK_HEADER, AC_CHECK_LIB etc).

Submitted by: Geoff Thorpe <geoff@geoffthorpe.net>
Reviewed by: Madhu, Justin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98999 13f79535-47bb-0310-9956-ffa450edef68
2003-03-13 20:36:39 +00:00
Justin Erenkrantz
5abd018c41 Use APR_LAYOUT instead of APACHE_LAYOUT in configure.
(We need a bug fix in this code, so let's merge the macro first.)

PR: 15679


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98685 13f79535-47bb-0310-9956-ffa450edef68
2003-02-17 02:32:20 +00:00
Justin Erenkrantz
e65f806d48 - Add MKDEP to config_vars.mk file
- Do not print out the commands used when doing 'make depend'


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98036 13f79535-47bb-0310-9956-ffa450edef68
2002-12-19 05:35:55 +00:00
Wilfredo Sanchez
9018dc55c1 If apr and apr-util are not in-tree, we need to be able to find the
include directory for each in order to generate the server/exports.c
and server/export_vars.h files.

configure.in:
 - Provide APR_INCLUDEDIR, APU_INCLUDEDIR.

server/Makefile.in:
 - Use $APR_INCLUDEDIR $APU_INCLUDEDIR vars.
 - Add export_files target to generate a list of headers with symbols
 to export, use that list to generate exports.c and export_vars.h.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97672 13f79535-47bb-0310-9956-ffa450edef68
2002-11-29 07:21:07 +00:00
Jeff Trawick
8ca3d031ce Add --[enable|disable]-v4-mapped configure option to control
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
2002-11-14 14:17:11 +00:00
Justin Erenkrantz
28bcef27bb Rework the apxs -cp command to work when the source dir isn't available by
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
2002-09-19 05:43:16 +00:00
Justin Erenkrantz
4aae1d5995 Update OpenSSL detection to work on Darwin.
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
2002-09-09 21:37:57 +00:00
Justin Erenkrantz
b69ca2ba7e Use APR_PARSE_ARGUMENTS instead of APACHE_PARSE_ARGUMENTS
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
2002-08-19 07:33:45 +00:00
Greg Stein
fbde20bb11 APACHE_LAYOUT_DEFAULTS was unused. nuke it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96377 13f79535-47bb-0310-9956-ffa450edef68
2002-08-14 20:43:52 +00:00
Roy T. Fielding
85b9759c23 Modified version check on openssl so that it finds the executable
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
2002-08-10 01:03:18 +00:00
Sander Striker
e7c412c7df Check for OpenSSL 0.9.6e or higher
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
2002-08-09 17:10:45 +00:00
Justin Erenkrantz
b37ea2f1ed Look for OpenSSL libraries in /usr/lib64.
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
2002-07-16 18:33:05 +00:00
Justin Erenkrantz
91ee01f298 Remove APACHE_MKDIR_P_CHECK in favor of new APR_MKDIR_P_CHECK.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95082 13f79535-47bb-0310-9956-ffa450edef68
2002-05-14 07:51:52 +00:00
Justin Erenkrantz
dce8d7788f Move the mkdir_p check outside of the cache check so that we will always
set that variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94699 13f79535-47bb-0310-9956-ffa450edef68
2002-04-18 17:29:59 +00:00
Justin Erenkrantz
11e7e50aaf Allow VPATH builds to succeed when configured from an empty directory.
(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
2002-04-18 09:01:31 +00:00
Aaron Bannert
8c5fa6e442 Generate rel_libdir and exp_libdir variables.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94512 13f79535-47bb-0310-9956-ffa450edef68
2002-04-06 22:00:56 +00:00
Aaron Bannert
184d24573e Allow us to override the default --libdir from the config.layout
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
2002-04-06 21:50:58 +00:00
Justin Erenkrantz
345bfe7ad1 Ensure that the build directory is created when using VPATH.
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
2002-03-26 19:43:46 +00:00
Aaron Bannert
f2ca17ee9a Added exp_foo and rel_foo variables to config_vars.mk for all Apache and
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
2002-03-21 19:40:06 +00:00
Aaron Bannert
b0ef3b6caf Allow spaces in the --prefix-like arguments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94107 13f79535-47bb-0310-9956-ffa450edef68
2002-03-21 19:23:39 +00:00
Greg Ames
b8c867e651 OS/390: install apachecore.[dll|x] in lib/ rather than bin/ .
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
2002-03-20 16:05:33 +00:00
Aaron Bannert
4a86a96acc Fix a comment about the /<target> appended to config.layout variables
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
2002-03-14 17:18:33 +00:00
Jeff Trawick
3a2b57187a Fix apxs -g handling.
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
2002-03-14 03:16:50 +00:00
Aaron Bannert
246a9306b5 Fix a problem in the new --enable-layout functionality where
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
2002-03-06 18:48:22 +00:00
Aaron Bannert
4e9e73570f Fix a typo in the default cgidir variable.
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
2002-02-28 01:38:11 +00:00
Aaron Bannert
bb7ef8124c Set defaults for non-autoconf path variables. Also export a couple
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
2002-02-27 19:40:27 +00:00