1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

120 Commits

Author SHA1 Message Date
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
Aaron Bannert
2d63c22764 Fix --enable-layout to work again.
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
2002-02-27 17:06:33 +00:00
Jeff Trawick
3247f72a99 fix some problems with variables in config_vars.mk
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
2002-02-26 21:31:45 +00:00
Doug MacEachern
c53456b4c1 mod_ssl adjustments to help with using toolkits other than OpenSSL:
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
2002-01-10 04:55:19 +00:00
Justin Erenkrantz
520de25b18 The -L and -R flags are linker flags not libraries. We need to add them to
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
2002-01-06 23:39:50 +00:00
Brian Havard
ac17c58a40 OS/2: Supply the configured libraries to the linker when building loadable
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
2001-12-30 14:05:55 +00:00
Jeff Trawick
6f730a1a64 change Apache/apr/apr-util to use run-time linking on AIX
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
2001-12-12 19:39:55 +00:00
Ryan Bloom
f4c07f4c74 Fix the installation target to make sure that the manual is
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
2001-11-24 15:52:44 +00:00
Ryan Bloom
cc570d9e45 Fix a typo in the configure script. The argument is --enable-mods-shared,
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
2001-10-11 04:50:57 +00:00
Ryan Bloom
705737ea79 Fixed the configure script to add a LoadModule directive to
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
2001-10-11 03:42:53 +00:00
Ryan Bloom
e4322fb2e1 Fix --enable-mods-shared processing. If most is specified,
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
2001-10-03 17:47:51 +00:00
Justin Erenkrantz
f493313f3a Kill two autoconf-related birds with one commit.
- 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
2001-09-30 07:57:15 +00:00
Jeff Trawick
e761a52a7c work around an AIX "issue" in the construction of config_vars.mk by
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
2001-09-06 18:22:46 +00:00
Ryan Bloom
273f948bb8 If the user doesn't specify a layout, then just use the Apache
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
2001-09-04 22:32:56 +00:00
Martin Kraemer
46956f4ebb My first try at relocating the manual tree outside of the htdocs/ directory.
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
2001-08-23 15:17:02 +00:00
Ryan Bloom
5fc0685808 We always need to include the openssl specific directory in the INCLUDES
variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90508 13f79535-47bb-0310-9956-ffa450edef68
2001-08-22 20:34:40 +00:00
Martin Kraemer
e8236dd60c In absence of an explicit --with-ssl= path,
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
2001-08-22 15:27:45 +00:00
Ryan Bloom
9d9bf07bd2 Add the openssl/include/openssl directory to the INCLUDES variable.
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
2001-08-20 22:30:17 +00:00
William A. Rowe Jr
1649223fb7 catch up with errordir. Modeled simply after iconsdir, hope that does it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90411 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 18:35:21 +00:00
Martin Kraemer
7e76f3b0f7 Extend 'openssl' search to the directories from PATH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90397 13f79535-47bb-0310-9956-ffa450edef68
2001-08-20 12:53:05 +00:00
Justin Erenkrantz
6aee410730 Per discussion on new-httpd, change the logic to do the following:
--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
2001-08-19 16:00:59 +00:00
Justin Erenkrantz
024d0191a5 Fix --enable-modules=all breakage with mod_auth_db and mod_auth_digest
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
2001-08-17 00:31:50 +00:00
Ryan Bloom
9ca6b593ef Install all build/*.mk when we install Apache. This is the first step
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
2001-07-30 02:55:55 +00:00
Ryan Bloom
a7582cf16c install the man pages when we install everything else.
PR:	7754


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89500 13f79535-47bb-0310-9956-ffa450edef68
2001-07-05 05:25:19 +00:00
Roy T. Fielding
62367507a9 Change the make targets and rules to be consistent in all of the
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
2001-05-18 00:48:57 +00:00
Roy T. Fielding
8ea5039bdb Fix httpd's definition of LTFLAGS to be consistent with that of apr
and apr-util, allow it to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS to replace what we were
formally abusing as LTFLAGS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89094 13f79535-47bb-0310-9956-ffa450edef68
2001-05-12 03:48:31 +00:00
Roy T. Fielding
f0fc04112f The pattern was too general -- it would match the date within the
OpenSSL version string instead of just the version number.  Fix it
using a hint from libtool.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89087 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 18:18:04 +00:00
Roy T. Fielding
87794e4de7 We don't need no stinkin libtool when APR already has one for us to use.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89079 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 07:10:24 +00:00
Roy T. Fielding
f90d61c872 Make the runtime path hack a little more portable, even though it is the
wrong way to check this.

Submitted by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89076 13f79535-47bb-0310-9956-ffa450edef68
2001-05-10 21:54:00 +00:00
Roy T. Fielding
80094ef570 Proving once again that bash doesn't bother to document when they
differ from sh for no particular reason.  I'm still too fond of perl 4.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89074 13f79535-47bb-0310-9956-ffa450edef68
2001-05-10 21:29:10 +00:00
Roy T. Fielding
ec4d3f7165 I forgot to add the bit that allows the macro to be called more than once.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89064 13f79535-47bb-0310-9956-ffa450edef68
2001-05-10 02:03:15 +00:00
Roy T. Fielding
ba518019b5 Eventually we will want to only find openssl once regardless of how
many modules depend on it, so make the check an autoconf macro.
Note that this still isn't being checked "the autoconf way", but it
is better than what we have now.

I'm not sure about the -R stuff, but I am told that Solaris won't
build without it.  This is something that should be tested using
AC_TRY_LINK rather than assuming openssl isn't already on the ld path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89063 13f79535-47bb-0310-9956-ffa450edef68
2001-05-10 01:47:47 +00:00
Brian Havard
baa865bddf OS/2: fix "make install" to install shared core & programs with a .exe
extension.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88963 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 08:25:52 +00:00
Roy T. Fielding
fedbb1b510 Remove some obsolete macros and rename one that wasn't name protected.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88962 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 06:45:35 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
Jeff Trawick
d685f0a8e5 Allow module names to be hyphenated in the --enable-mods-shared
argument.  Previously, we passed through a user-specified hyphen into
the name of the shell variable, yielding an invalid variable name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88956 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 18:29:11 +00:00
Marc Slemko
2918690131 Temporary (hopefully) reversion to the previously used hack to
allow --prefix to work for now.  This means that part of the Apache
layout is duplicated in configure.in again.

There are a _LOT_ of inconsistencies in different places about what
items in config.layout are actually used and how they can be set.

Also, change the couple of other things that are necessary to make
/usr/local/apache2 the default prefix when using this way of doing
things.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88704 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 23:47:39 +00:00
Marc Slemko
afe19afd61 - change inconsistent use of logdir and logfiledir all to logfiledir, to
make the config.layout file work properly.
- change default layout to be "Apache", as defined in config.layout,
  instead of duplicating (some of) that layout in configure itself.
- change default installation path to /usr/local/apache2

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88692 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 17:03:35 +00:00
Roy T. Fielding
ab56f4788f Use APR's macro to generate config.nice
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88685 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 05:51:20 +00:00
Victor J. Orlikowski
28f7a845a1 Changes to get AIX DSOs working, sans APR changes.
Basically, this allows linker flags to be passed for the httpd executable
and DSOs only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88655 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 19:06:02 +00:00
Ryan Bloom
e27ddf4fac Fix --enable-layout processing on NetBSD. This makes us use a consistant
location for the config.layout file, and it makes us a bit more portable.
PR:     7482
Submitted by:   jun-ichiro hagino <itojun@iijlab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88647 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 16:15:31 +00:00
Brian Havard
dea84b1a0b Switch to using aplibtool for building under OS/2 & add support for building
loadable modules as OS/2 DLLs.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88645 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 15:20:45 +00:00