Parent Directory
| 
Revision Log
| Links to HEAD: | (view) (annotate) |
| Sticky Revision: |
We need to link only ab against libm (because of sqrt()).
Revert r422298, because it introduces GNU Make specific extensions to the Makefile, and should be replaced by doing the work inside configure, instead of the Makefile.in.
Makefile.in: Don't try to compile checkgid and fcgistarter on win32 when using the autotools build system. /support: Update svn:ignore for generated exe files
Merge the fcgi-proxy-dev branch to trunk, adding a FastCGI back end for mod_proxy. This log message is just a summary of the changes, for the full original log messages see r357431:393955 in branches/fcgi-proxy-dev. * modules/proxy/mod_proxy_fcgi.c: New file, holds the impementation of our new fcgi backend for mod_proxy. * modules/proxy/fcgi_protocol.h: New file, holds constants and structures for the fcgi protocol. * modules/proxy/mod_proxy_balancer.c (proxy_balancer_canon): Set up r->path_info, so the PATH_INFO env variable is correctly passed on to balancer workers. * modules/proxy/config.m4: Build the new mod_proxy_fcgi module. * support: Add fcgistarter to svn:ignore. * support/Makefile.in: Build the new fcgistarter program. * support/fcgistarter.c: New program, a helper for starting fcgi worker processes.
Add the httxt2dbm utility to create DBM files for RewriteMap. This replaces the txt2dbm script in the manual, and allows the use of any available DBM format.
general property cleanup
Add htcacheclean to function as cleanup utility (daemonizable) for mod_disk_cache. (Justin did a whole bunch of style tweaks, and some minor functionality tweaks to get it to function on Solaris.) Submitted by: Andreas Steinmetz Reviewed by: Justin Erenkrantz
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
* support/Makefile.in (suexec): Don't link against libapr etc; suexec is self-contained.
suexec is sometimes built by make so it needs to be removed by make clean
envvars-std is build by configure so it needs to be removed by make distclean or make extraclean
Allow 'make install DESTDIR=/path'. This allows packagers to install into a directory different from the one that was configured. This also mirrors the root= feature from 1.3. We cannot use prefix=, because both APR and APR-util resolve their installation paths at configuration time. This means that there is no variable prefix to replace. PR: 7803 Submitted by: Andreas Hasenack <andreas@netbank.com.br>
On OS/390, the compiler/linker front-end doesn't handle "-L/path/to/lib after "-o target". After looking into build failures, it turned out that we specify EXTRA_LDFLAGS twice (once before "-o target" and once after "-o target") for httpd and for the support utilities.
Considering the overall goal of making APR and APR-util being used out-of-tree, AP_LIBS can not be a PROGRAM_DEPENDENCY, but just a library that we link against - therefore, it belongs under PROGRAM_LDADD. (A program dependency implies that we can build it - that will not always be the case with APR and APR-util.)
Better test for the presence of $(sbindir) since that is where we are going to install. Submitted by: Thom May <thom@planetarytramp.net>
add htdbm to the Makefile.
Move any load library path environment variables out of apachectl and into a separate environment variable file which can be more easily tailored by the admin. The environment variable file as built by Apache may have additional system- specific settings. For example, on OS/390 we tailor the heap settings to allow lots of threads.
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
Forces suexec to be compiled statically. This is necessary since it is difficult and sometimes impossible to relocate executables that are both setuid and dependent on dynamically loaded libraries. (that is: setuid binaries ignore LD_* environment variables).
Bring forward checkgid helper from 1.3; checks runtime validity of httpd Group directive-style group identifiers.
In one target we weren't always creating the $libexecdir ($prefix/modules) directory, and in another we were assuming that the directory existed. Now we always create it in the first target, and we check that it exists in the second. This fixes a bug where httpd.exp would be installed as a _file_ called $prefix/modules.
Make sure we install apxs.
Make sure we install all of the support scripts.
Allow support programs to be compiled against a static version of libapr. This allows the smaller support programs to be relocated. Submitted by: Aaron Bannert <aaron@clove.org>
Allow make install to work when built with VPATH.
rules.mk is stored in $(top_blddir). Without this change, VPATH builds stop working.
Make Apache 2.0 install all files in the same location as Apache 1.3 did. PR: 7626
Allow all parts of Apache 2.0 to build when --srcdir is used. This required exposing a build directory and a source directory to all parts of Apache's build system. It also required a small hack in APR-util, if we are using the bundled Expat, and we are using VPATH support, then we have hard-coded the xml/expat location. I couldn't figure out how to allow the configure script to determine the correct location. I added a comment, but if somebody else figures it out, we should fix that at some point. PR: 7630
Greg was right, I was wrong. We don;t need these here anymore, since the copy is done directly from the server directory. I need more sleep. :)
Small change to pass full paths instead of relatives.
Clean out httpd.exp when cleaning up.
Generate httpd.exp on the fly.
This should allow DSOs to work on AIX, without the headache of maintaining
the httpd.exp file.
This is adapted from OS/2's generation of ApacheCoreOS2.def.
There exist a few bugs still:
1) mod_dav and mod_proxy may not yet work, due to certain namespace issues.
2) Some symbols may need to be added, a la core_header.def
Once these have been fixed, the old httpd.exp file will be deleted.
Change the make targets and rules to be consistent in all of the Apache-owned source trees. Sanity is a good thing.
Do not install the binaries from the support directory twice. PR: 7490 Submitted by: jun-ichiro hagino <itojun@iijlab.net>
Make clean, distclean, and extraclean consistently according to the Gnu makefile guidelines. Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com> Reviewed by: Roy Fielding
Libtool takes care of the lib prefix so get rid of our own workaround.
Fix a compile break related to the apr libtool change.
- add some missing distclean targets - use DISTCLEAN_TARGETS and CLEAN_TARGETS everywhere (to be consistent with other macros and with APR) - warn that aclocal.m4 is a generated file
Get SuEXEC building properly.
Use the correct apr-util library
Add apr-util to the build process. This should now build once everything has been checked out to the correct locations.
Apache builds again, although the test directory doesn't. I will work on the test directory soon. The server does NOT currently run, but it does build cleanly.
Get the support programs building properly. Httpd itself is next.
Get base Apache to build properly. This doesn't solve the problem of not having apr-util, but we should be getting to the link stage now.
reorder libapr.a and libap.la in terms of dependencies (i.e., libap needs libapr, so put libapr last) for OS/390
Overall UNIX build system improvements: * Makefile header is now completely dynamic * Absolute paths everywhere (fixes Tru64 support) * Get rid of LTLIBRARY_SHARED_NAME rule in library.mk (fixes Irix support, untested) * VPATH does not contain variables anymore (fixes UnixWare support) * Remove inclusion of program.mk in support/Makefile.in (PROGRAM_NAME is empty => breaks Irix and others) * Call REENTRANCY_FLAGS earlier, so that flags are passed to header checks (might fix OpenBSD pthread.h-detection, untested)
Add the support directory back into the build process.
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| apache@apache.org | ViewVC Help |
| Powered by ViewVC 1.1.2 |