summaryrefslogtreecommitdiffstats
path: root/acinclude.m4 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Remove code to support per-dir-CA configuration which relies on aJoe Orton2009-03-231-1/+0
| | | | | | | | | | | | | | | 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
* Make OpenSSL pkg-config usage consistent so that we don't run the earlyJustin Erenkrantz2009-01-031-25/+29
| | | | | | | | | | | | | | 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
* Fix up SSL autoconf-fu so as not to emit bogus lines.Justin Erenkrantz2009-01-031-5/+4
| | | | | | | | | | * 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
* SSL libs are needed in linking only for ab and mod_ssl.Rainer Jung2009-01-031-1/+7
| | | | | | | | | | | | 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
* * Correctly set SSL_LIBS during openssl detection if pkgconfig is not available.Ruediger Pluem2008-11-061-2/+2
| | | | | | | PR: 46018 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@711993 13f79535-47bb-0310-9956-ffa450edef68
* This macro for SSL detection was altogether wrong. RefactoringWilliam A. Rowe Jr2008-06-201-67/+45
| | | | | | | | | 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
* Since we are using AC_CACHE_CHECK, avoid warningJim Jagielski2008-06-091-4/+4
| | | | | | | 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
* Enable to configure the https port - missing pieces.Guenter Knauf2007-12-251-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606806 13f79535-47bb-0310-9956-ffa450edef68
* * acinclude.m4: When enabling a static library, ensure that the module'sJustin Erenkrantz2006-03-181-0/+3
| | | | | | | | | 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
* * acinclude.m4 (APACHE_CHECK_SSL_TOOLKIT): Add PKG_CONFIG_PATH forJoe Orton2006-02-171-0/+4
| | | | | | | | | | 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
* * acinclude.m4 (APACHE_ENABLE_MODULES): Support passing "none" toJoe Orton2005-12-161-9/+14
| | | | | | | --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
* Invert the "yes" and "no" values for $ap_void_ptr_lt_long, whichColm MacCarthaigh2005-10-041-3/+3
| | | | | | | 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
* One way or another, whether we leave the casts in or out, right now we areColm MacCarthaigh2005-10-041-0/+21
| | | | | | | | | | 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
* Use rsync to install manual and htdocs to speed up installation times.Justin Erenkrantz2005-09-301-0/+1
| | | | | | | | | | | | | | * 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
* * acinclude.m4 (APACHE_CHECK_APxVER): New macro, for checkingJoe Orton2005-09-271-0/+41
| | | | | | | an apr/apu version requirement. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291972 13f79535-47bb-0310-9956-ffa450edef68
* * configure.in, acinclude.m4: Substitute AP[RU]_CONFIG with locationJoe Orton2004-08-131-0/+2
| | | | | | | | | | | 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
* Teach apxs how to find ap{ru}-$AP{RU}_MAJOR_VERSION-configJustin Erenkrantz2004-08-021-0/+2
| | | | | | | (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
* Workaround RHEL 3 'cuteness' for OpenSSL by calling pkg-config openssl.Justin Erenkrantz2004-07-191-0/+14
| | | | | | | 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
* * acinclude.m4 (APACHE_MODPATH_ADD): Give the convenience library aJoe Orton2004-03-261-1/+1
| | | | | | | | 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
* Fix use of mod_ssl as a DSO linked against static SSL libraries; alsoJoe Orton2004-03-061-6/+9
| | | | | | | | | | | | | | | | | | | | 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
* Correct use of libtool: libtool convenience libraries which are to beJoe Orton2004-01-191-1/+2
| | | | | | | | | | | | | | | | | | 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
* * acinclude.m4 (APACHE_MODULE): Remove redundant $ac_n and $ac_cJoe Orton2004-01-091-1/+1
| | | | | | | variables. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102242 13f79535-47bb-0310-9956-ffa450edef68
* Improve help for --enable-modules= and --enable-mods-shared= by showing the ↵Martin Kraemer2004-01-051-2/+2
| | | | | | alternative 'all' and 'most' meta-module git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102189 13f79535-47bb-0310-9956-ffa450edef68
* Mention in the comment that we expect a _space_separated_ list of moduleMartin Kraemer2003-12-151-2/+3
| | | | | | | | 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
* Use three-argument form of AC_DEFINE everywhere; remove acconfig.hJoe Orton2003-07-101-2/+2
| | | | | | | 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
* Based on list discussion between myself and Geoff, it seems prudentWilliam A. Rowe Jr2003-05-301-0/+4
| | | | | | | | | | | | | | 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
* Silly cut'n'paste errorWilliam A. Rowe Jr2003-05-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100042 13f79535-47bb-0310-9956-ffa450edef68
* Clean up the OpenSSL/SSL-C tests...William A. Rowe Jr2003-05-271-28/+56
| | | | | | | | | | | | | | | 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
* Any library could benefit from SSL_set_cert_store(), if the libraryWilliam A. Rowe Jr2003-05-271-1/+1
| | | | | | | sources have been patched. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100039 13f79535-47bb-0310-9956-ffa450edef68
* As Geoff Thorpe <geoff@geoffthorpe.net> points out, we must perform ourWilliam A. Rowe Jr2003-05-271-0/+4
| | | | | | | | | | | | | | | | 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
* Fix tpyo in APACHE_CHECK_SSL_TOOLKIT for ap_platform_runtime_link_flag case.Justin Erenkrantz2003-03-311-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99149 13f79535-47bb-0310-9956-ffa450edef68
* Modify the APACHE_CHECK_SSL_TOOLKIT to detect SSL-C (atleast version 2.1).Madhusudan Mathihalli2003-03-131-7/+19
| | | | | | | Submitted by: Madhusudan Mathihalli git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99000 13f79535-47bb-0310-9956-ffa450edef68
* Replace the APACHE_CHECK_SSL_TOOLKIT method with a cleaner one, usingMadhusudan Mathihalli2003-03-131-87/+85
| | | | | | | | | | 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
* Use APR_LAYOUT instead of APACHE_LAYOUT in configure.Justin Erenkrantz2003-02-171-70/+0
| | | | | | | | | (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
* - Add MKDEP to config_vars.mk fileJustin Erenkrantz2002-12-191-0/+1
| | | | | | | - 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
* If apr and apr-util are not in-tree, we need to be able to find theWilfredo Sanchez2002-11-291-0/+2
| | | | | | | | | | | | | | | | 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
* 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-071-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