| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94107 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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 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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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 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
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90508 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90411 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90397 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
| |
--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
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
PR: 7754
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89500 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89079 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89064 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
extension.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88963 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88962 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88685 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
aclocal.m4, generated_lists, build.mk, build2.mk, and a host of other
libtool muck that is now under srclib/apr/build. More to follow.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88570 13f79535-47bb-0310-9956-ffa450edef68
|