Fix indentation and tab use after r1652955.

Addition to r1652955: Use "=" in combination with "test" instead of "==".

PR 57379: If mod_cgi and mod_cgid get installed, use IfModule for MPM to LoadModule mod_cgi for prefork and mod_cgid for all other MPMs. Previously when combined with --enable-load-all-modules both modules were loaded and it was undefined which one actually handled cgi requests. Based on a patch by olli hauer <ohauer gmx.de>.

mod_ssl: Add hooks to allow other modules to perform processing at several stages of initialization and connection handling. See mod_ssl_openssl.h. This is enough to allow implementation of Certificate Transparency outside of mod_ssl.

we need to remove this fluff as well

Don't link support/* against systemd libs. * Makefile.in: Link httpd using $(HTTPD_LIBS). * configure.in: Add systemd to HTTPD_LIBS rather than LIBS. Add PCRE libs to HTTPD_LIBS.

Install cache_common.h as required by mod_cache.h. Allows external modules to use mod_cache. Submitted by Niklas Edmundsson.

Export mod_xml2enc.h so that others can use the module.

suexec: Support use of setgid/setuid capability bits on Linux, a weaker set of privileges than the full setuid/setgid root binary. * configure.in: Add --enable-suexec-capabilites flag. * Makefile.in: If configured, use setcap instead of chmod 7555 on installed suexec binary. * modules/arch/unix/mod_unixd.c (unixd_pre_config): Drop test for setuid bit if capability bits are used. * docs/manual/: Add docs.

Install multiple files per install.sh invocation Libtool and BSD install support installing several files in one run. Add support to install.sh and instdso.sh, too. Replace for-loops in the Makefiles. This reduces 'make install' time by approx. 50% because we save lots of calls to the huge libtool shell script. The AIX-specific magic in instdso.sh could use some testing.

Add a validate-xml target

Distinguish properly between the bindir and sbindir directories when installing binaries. Previously all binaries were silently installed to sbindir, whether they were system administration commands or not.

Add APLOGNO() macro for unique tags for every log message. Add some scripts to make adding these tags easier.

Fix installation of conf/extra/proxy-html.conf. Otherwise httpd does no longer start, because it is the only extra file required in the main config at the moment.

Fix selection of loaded modules on AIX because its grep doesn't understand \< and \>

Load all modules in the generated default configuration when using --enable-load-all-modules with configure.

Fix make variable reference.

By default, only load those modules that are either required or explicitly selected by a configure --enable-foo argument. The LoadModule statements for modules enabled by --enable-mods-shared=most and friends will be commented out.

Merge branch revert-ap-ldap: Revert ap_ldap integration due to veto by Graham Leggett Mailing list threads: http://mail-archives.apache.org/mod_mbox/httpd-dev/201106.mbox/%3C4192DC1D-C0B9-42BB-B614-C3A41290F18B@sharp.fm%3E http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%3C4E15E51E.4090700@rowe-clan.net%3E

Move PCRE_LIBS from HTTPD_LDFLAGS to PROGRAM_LDADD. Otherwise -lpcre comes before libmain which leads to undefined recences during linking of httpd. Followup to r1142739.

remove ap_ldap.h in make distclean

apache_probes.h is generated by configure

Note style flaw, this is rather inappropriate on a global basis, no?

catch missing .h for install

Bring back OS/2 support. Reverses r758929 with a little bit of conflict resolution.

Here's the simpler solution to the two groups of mappers/ modules... The mod_so and mod_watchdog are truly not mappers/ at all. Very open to better names than modules/core/ but these are clearly API's which are to be consumed by the httpd core, or generically, any module.

install mod_serf.h

remove OS/2 platform support

MPM header files are private; don't install them

Add watchdog module header to dist include

Export and install the mod_rewrite.h header to ensure the optional rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are available to third party modules.

mod_core.h moved to include/

mod_request.h / mod_auth.h moved to include/

Move the public mod_request.h header out of the include directory and back to modules/filters. The current build of exports.c assumes that everything in include is part of the core, and so putting the header there creates link errors.

Make sure the mod_session.h public header is exported correctly to the rest of the server.

Also install the so, rewrite and cache header files.

Enabled to configure the https port as we do with http port too.

Add forgotten '||true' to prevent 'make install-man' from returning an error if rsync is not present on the platform

make mod_dbd.h available for all who need it

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)

As recommended by nd, build docs for all languages.

* Makefile.in (docs): If the "docs-build" project is available, trigger its build system to turn the XML sources into HTML. Otherwise, display a URL to the instructions on how to use the docs build. * build/rules.mk.in: (.PHONEY): docs is a fake target. Submitted By: Daniel Rall <dlr apache.org>

Sanitize the installed config_vars.mk to remove references to the build and source directories, and to remove variables which are internal to the httpd build system: * build/config_vars.sh.in: New file. * Makefile.in (build/config_vars.out): New target. (install-build): Install build/config_vars.out as config_vars.mk. * configure.in: Add include path for srclib/pcre to INCLUDES rather than CPPFLAGS, and use a topdir-relative not absolute path name. Generate build/config_vars.sh. Reviewed by: Paul Querna PR: 20874, 28145

* Makefile.in (install-build): Make installed config.nice 0755 too. Submitted by: Daniel Rall <dlr apache.org>

* Makefile.in (install-build): Fix variable names.

* Makefile.in (install-build): Install mkdir.sh since it's used by the installed special.mk now; install instdso.sh as 0755. * support/apxs.in: Fix Makefile template created by -g.

* Makefile.in (install-build, install-headers, install-conf): Minor cleanup: use MKINSTALLDIRS unconditionally since mkdir.sh already checks whether the target exists; use INSTALL_DATA throughout. Stop trying to install os/*/os-inline.c which don't exist any more.

* Makefile.in (DISTCLEAN_TARGETS): Clean up more files generated by configure.

* Makefile.in: Fix brokenness with VPATH builds as the .conf files do not exist in srcdir and sh panics; also fix one whitespace issue.

Fix 32787 and the problems I have when using --enable-experimental-libtool. (libtool is an excutable in this case).

Make sure we don't overwrite existing config if it has a name other than httpd.conf. Submitted by: Rici Lake

Merged the simple-conf branch changes r159781:160695 into the trunk.

Support use of an external copy of the PCRE library: * configure.in: Set abs_{builddir,srcdir} higher. Add --with-pcre flag; build against external PCRE library if used. * Makefile.in (install-include): Don't install pcre headers any more. * srclib/Makefile.in (SUBDIRS): Remove. PR: 27550 (part two) Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton

* Makefile.in: Use buildmark.o not .lo since it was COMPILEd not LT_COMPILEd.

Only recompile buildmark.c when we have to relink httpd. This allows us to be able to do a make on an up-to-date tree without forcing a recompile and relink. Yay!

* Makefile.in: Make install-man the last install target as it copies an excruciatingly large amount of files. (We should also filter the .svn sub directories before copying it, too.)

* Makefile.in: In the updated 5.x pcre build, pcre.h is in builddir.

Initial pass at refactoring some files to eliminate our 150K C source behemoths. * Makefile.in: Change order of dependencies to bring in exports.o first so that we have every symbol 'used' before the linker starts processing. * build/rules.mk.in: Add a 'program-install' target which just copies httpd. * server/Makefile.in, modules/http/config2.m4: Add in new file targets. * NWGNUmakefile, libhttpd.dsp: Blind updates for Netware and Win32. (I tried.) * server/core.c: Move core_input_filter, net_time_filter, and core_output_filter and all supporting functions to... * server/core_filters.c (copied): ...here. * modules/http/http_protocol.c: Move functions from here to there...namely: * modules/http/byterange_filter.c (copied): Relocate ap_byterange_filter() and friends. * modules/http/chunk_filter.c (copied): Relocate chunk_filter(). * modules/http/http_etag.c (copied): Relocate ap_set_etag and ap_make_etag(). * modules/http/http_filters.c (copied): Relocate ap_http_filter(), ap_http_header_filter(), ap_discard_request_body(), ap_setup_client_block(), ap_should_client_block(), and ap_get_client_block().

Change the other install-* targets to remove the .svn directory instead of the non-existant 'CVS' one.

Replace the hack to remove CVS directories with one for Subversion '.svn' directories. There *should* be a better way to only install the manual files, and not the '.svn' directories. Without this, multiple make installs to the same prefix will fail.

* Makefile.in: Link httpd against user-supplied $(LIBS). PR: 7882

Move mod_ssl-internal interfaces into ssl_private.h; allow mod_ssl.h to be included even when mod_ssl is not enabled. * Makefile.in (install-include): Only install mod_ssl.h. * modules/ssl/ssl_private.h: New file. * modules/ssl/mod_ssl.h: Move everything apart from than the optional hook definitions into ssl_private.h. * modules/ssl/*.c: Include ssl_private.h not mod_ssl.h * modules/ssl/config.m4: Always add the mod_ssl directory to the include path so other modules can find mod_ssl.h. * modules/proxy/mod_proxy.c: Include mod_ssl.h to pick up the optional hook definitions rather than copy'n'pasting them.

Fix regeneration of build datestamp on every make invocation (a regression since 1.3). * Makefile.in: Remove redundant PHONY_TARGETS setting. * server/Makefile.in: Mark buildmark.c as phony; build it indirectly via buildmarked.c since implicit rules are ignored for phony targets.

I knew I would get in trouble mucking with the build system. Use topbuilddir rather than topsrcdir to find config.nice. Submitted by: Justin Erenkrantz

Install config.nice into the build/ directory to make minor version upgrades easier.

Add optional hook to extend mod_status output. * configure.in: Add modules/generators to include path. * Makefile.in: Install mod_status.h. * modules/generators/mod_status.h: New file. * modules/generators/mod_status.c: Implement ap_run_status_hook. (status_handler): Run status hooks.

httpd.spec should be removed by make extraclean

distclean/extraclean tweak: blow away docs/conf/ssl-std.conf

Fix my build breakage of TRU64 (hopefully, based on Jeff's feedback.)

Fix a VPATH build install bug - the special.mk file was never installed (because we didn't rewrite it to the VPATH from the sourcepath), so copy any sourcepath\build\*.mk files along with the vpath\build\*.mk files.

Remove files on 'make distclean' that should be. PR: 15592

Copy mod_auth.h when installing includes. (Allows external auth providers DSOs)

"Make install" would fail for released versions because they do not contain CVS directories.... Noticed by Marco Lorig, mlorig at gmx dot net.

Install the online manual unconditionally. This gets make install closer to how it *really* works in 1.3. Also, get rid of CVS stuff in the manual/ directory Submitted by: Justin Erenkrantz, Greg Ames

fix a broken build when no <prefix>/conf/ directory exists. Submitted by: Karl Fogel Reviewed by: Greg Ames

remove logic which looks for a non-existant ssl.conf file in the docs/conf/ build directory (it's ssl-std.conf there), then ignores its absence in the next line.

no logic changes - just some style changes.

Install mime.types and magic in conf/ if they don't already exist. This also re-enables existing logic to always install *-std.conf with substitutions made. These are then copied into *.conf (without the -std) if that file doesn't already exist. style police: please chill for a bit. I intentionally didn't re-format the indenting in this commit to make it easier to review.

fix make install to stop passing make operators to the shell

I got sick of the error messages from copying the header files. This removes all of the error messages.

Preserve existing installation directories. We copy over binaries, the build directory, the headers, and the man pages. Everything else, the config, htdocs, manual, error, icons, and cgi directories are not installed if the directories already exist. I got sick of having to re-edit printenv for my tests, and this is the same logic 1.3 used.

The '-@' seems to be more portable than '- @'. FreeBSD complained about the latter. Tested on: Linux, FreeBSD, Solaris, HP/UX, Darwin

Fixed a problem with 'make install' on one of the tarballs (which have the CVS dirs removed already) with ReliantUnix's rm: Installing configuration files Installing HTML documents Usage: rm [-firR] file ... make[1]: *** [install-htdocs] Error 2 make[1]: Leaving directory `/home1/apache20/httpd-2.0.37' make: *** [install-recursive] Error 1 Submitted by: Jean-frederic Clere <jfrederic.clere@fujitsu-siemens.com>

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.

Removed extraneous "{} \;" from some xargs calls Submitted by: Joe Orton <jorton@redhat.com> Reviewed by: Brian Pane

Make sure that the runtimedir is created by make install. PR: 9233

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.)

Stop trying to help apr and apr-util by installing their includes. They're smart enough to do so on their own.

get "make extraclean" and probably "make distclean" to work on AIX again... $(RM) isn't defined everywhere (GNU make built-in?), so invoke rm the way we invoke it elsewhere in the makefile

Remove autom4te.cache when doing make distclean. We can't specify it in DISTCLEAN_TARGETS because it is a directory. Perhaps we could modify DISTCLEAN_TARGETS to delete dirs too, but that's outside the scope of what Thom (or I) want to deal with now. Submitted by: Thom May <thom@planetarytramp.net> Reviewed by: Justin Erenkrantz

Fix generated httpd.conf to respect layout for LoadModule lines. PR: 8170 Submitted by: Thom May <thom@planetarytramp.net> Reviewed by: Justin Erenkrantz

Don't install *.in config files.

Added support for MPMs that live in subdirectories under server/mpm like server/mpm/experimental/*

With VPATH builds, the httpd.conf-std file is found in the build directory, not the source directory. Make sure we check both from now on.

Remove hardcoded paths from MPMs and move them to a more central place. Expand paths in httpd-std.conf in a similar fashion as we do in our headers. Submitted by: Pier Fumagalli <pier@betaversion.org>

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.

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.)

Stop copying APR's libtool. And pass enough parameters to apr's subconfig so that it can figure out where we would like libtool to be installed.

It is bad to recursively remove every CVS directory in a person's home directory. Bad bad bad. Make sure the variable was set to something before cd-ing to blank and ending up in their $HOME. Also, since each line under a make rule is treated as a new subshell, it's not necessary to surround the whole line in ()s.

need to copy mod_log_config over for custom-loggers Obtained from: Steve Linde

Currently pcre/config.h and pcre/internal.h are getting installed - it seems they aren't used, and adding a rogue config.h into the include path can cause problems for a module which picks it up. (Better late than never -- this patch was submitted Fri, 7 Dec 2001.) Submitted by: Joe Orton <joe@manyfish.co.uk> Reviewed by: Aaron Bannert

Make sure we use the same version of Make for building suexec as we do for building the rest of the package.

need to use $(top_srcdir) when installing build/instdso.sh else make install does not work when when configured with a --srcdir PR: Obtained from: Submitted by: Reviewed by:

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.

make sure mod_foo.so is installed by apxs -i also, it is the .so file that needs to be executable, not the .la file

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>

mod_ssl is big and bulky, takes awhile to load, sometimes must wait for entropy to be collected, and has a nasty little bug that prevents the server from being started in non-SSL mode. This patch corrects some of those problems, but is not intended as a workaround for the bug. Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com> Reviewed by: Aaron Bannert

Remerge proxy configuration. Tally: of 9 votes; Majority for segregating mod_ssl Minority for segregating mod_proxy Also remove a lingering bit of ldap config from httpd-std.conf

Teach me to copy and paste.

Make sure we install the proxy header file.

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>

Rename ssl-std.conf to match Makefile.in's installation action

Make sure we run the new conf files through sed. Now, the question is whether it might make more sense to have them as ssl-std.conf, ldap-std.conf, and proxy-std.conf. (I'm also not sure if this is even shell portable or not.) I'll leave that up to OtherBill since he added these files.

Suexec is compiled to the builddir, not the source dir. PR: Obtained from: Submitted by: Reviewed by:

If we are going to have an optional function, we have to install that header file, so that people can use it.

Allow make install to work when built with VPATH.

rules.mk is stored in $(top_blddir). Without this change, VPATH builds stop working.

Install the mod_core.h file. Mod_proxy relies on it. Submitted by: Ian Holsman <ianh@cnet.com>

fix suexec's install by invoking some powerful Sascha magic.

Fix a typo.

Improvements to APXS. It now uses the config_vars.mk variables to figure out how to build stuff. It uses the Apache build system for the generated module, but not for command line builds. Maybe I'll fix that one day. If somebody wants to beat me to it, that would be cool.

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

If my grep and brain are working, that's all there is to adding error/ to the *nix build. If I'm wrong, don't shoot.

Install the SSL header files. Submitted by: John Sterling <sterling@covalent.net>

Install all build/*.mk when we install Apache. This is the first step to getting apxs to use the same makefiles as Apache.

install the man pages when we install everything else. PR: 7754

Doxygenation.

Change the make targets and rules to be consistent in all of the Apache-owned source trees. Sanity is a good thing.

Add a missing backslash in the install-other code so that the httpd.dll logic isn't displayed.

OS/2: fix "make install" to install shared core & programs with a .exe extension.

This changes the build process as outlined in my email earlier this week. Essentially we now build the static objects, then allow a platform to run a given command, build the shared modules, then run another command before exiting. This gets us building dso's on beos and may provide a better framework for some of the other "strange" platforms out there without stopping the normal ones working.

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

Fix errors in generating docco using make docs.

- 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:

Changes to get AIX DSOs working, sans APR changes. Basically, this allows linker flags to be passed for the httpd executable and DSOs only.

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:

First step in doxygen conversion.

don't try to install expat, since it isn't there anymore.

turn on setuid permissions when installing suexec Submitted by: Ken Coar

fix make install so that suexec is installed where the server expects to find it ( <prefix>/sbin by default). also enable ./configure --sbindir=DIR to work as advertised.

Intermediate change of hardcoded "helpers" reference to "build" until I get a chance to revamp this to use APR's variables directly.

Install all required header files. Without these, some modules can not be compiled outside the src tree.

Make docs target work.

Fix a small bug that was making us create a directory called "-p" in the build directory.

If --enable-suexec is specified, then we need to build suexec automatically. This bit me multiple times last night as I was trying to setup apache.org. I would make a change to the configuration, run make; make install, and it would fail. The problem was that suexec wasn't getting re-compiled ever, so my changes weren't getting picked up. This solves that problem, by making sure that suexec gets compiled if it was specified on the configure line.

- 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

We don't want to install CVS files, but the -P option to cp means something different on FreeBSD than it means on Linux. This puts the recursive copy back in, and just has us delete the CVS directories after they are copied into place.

Fix a small typo that was causing big problems.

Make it possible to build suexec from the top-level Makefiles, and make it install when using make install

We don't want to install the CVS directory when we use make install

Remove the test directory from the top level Makefile, and move the STATUS item to "non-showstopper but nice to fix" category. This is in preparation for tomorrow's BETA.

Remove some redundant checks. Submitted by: Greg Stein

Install all headers in the include/ directory.

Force all Apache functions to be linked into the executable, whether they are used or not. This uses the same mechanism that is used for APR and APR-util. This may not be the correct solution, but it works, and that is what I really care about. This also renames CHARSET_EBCDIC to AP_CHARSET_EBCDIC. This is for namespace correctness, but it also makes the exports script a bit easier.

Add some files that should be installed when we install Apache.

*) top-level: build our base libraries (srclib) first since these (by definition) have no dependencies on anything else. this will also ensure that we have *.exports available for building server/ *) add the "test" SUBDIR back in so that it gets called for "make clean" and other types of make targets. *) revise test/Makefile.in so that it does not build any test programs by default. add "make test" to build any/all test programs.

Change some spaces to tabs.

Install the manual correctly.

don't build test by default. users/developers can go to the dir manually and build if necessary.

Get Apache installing again.

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 Apache to configure completely again. This still doesn't build, but now we are getting very close.

Use autoconf to substitute the proper values into apachectl, and install it when we install everything else.

Install APXS if it is built.

Fix a small typo that was keeping us from copying os-inline.c to the include directory

BeOS doesn't have an os-inline.c file so don't try to install it!

publish the mod_dav.h header for DAV backend providers to use

If the src/apachecore.dll and src/apachecore.x files exist, copy them to the install bin directory during "make install". Used for OS/390 dso builds.

Remove extra tabs from Makefiles Submitted by: David Hill <ddhill@zk3.dec.com>

Add a make directive for making the documentation

Add recognition of the --with-port=n (as was added to 1.3), and raise an error if --enable-layout is specified but we can't find the definition file.

Don't bark at developers which are too lazy to pull down the htdocs module. ;-)

Install htdocs again. This was recently removed for an unknown (or at least unmentioned) reason. Crash course on populating the htdocs directory: cd myprefix/apache-2.0 cvs checkout -d htdocs httpd-docs-2.0/htdocs

Clean up rules.mk and add support for building C++ source files. If your module uses C++, you need to add APACHE_REQUIRE_CXX to your module's config.m4. Unfortunately, we cannot use any sophisticated pattern matching in make, so instead of adding the C++ source files to LTLIBRARY_SOURCES, you need to write for foo.cpp and bar.cpp: LTLIBRARY_OBJECTS_X = foo.lo bar.lo

config magic for enabling DAV, Expat, and SDBM. *) AP_LIBS contains the target .a files from src/lib/ *) AP_LIB_DIRS contains add'l directories (besides pcre and apr) that we will build (and generate Makefiles for) *) apache_need_expat and apache_need_sdbm are two new configure feature macros; set by the DAV stuff as needed *) hackery to deal with dav/fs/ since it isn't really a module *) do endian testing, so we can feed it into Expat to optimize that code

Finish the switch to light-wheight pcre.

Fix PCRE build on OS/2. This includes taking libtool out of the picture, making static build the default.

src/build/build2.mk: build PCRE's configure script if needed (when you run buildconf, for example) src/Makefile.in : re-order libpcreposix.la and libpcre.la to make OS/390's binder happy (now the libraries are listed in order of dependencies)

Replace hsregex with PCRE. The PCRE library is always used in 2.0, regardless of what system we are on. Currently, we are using the POSIX wrappers that PCRE provides.

Install os.h and os-inline.c from src/os/$(OSDIR) to $(prefix)/include

Make install target work on AIX.

Add VPATH support to Apache: os/$(OS_DIR) is now equivalent to the old $(OS_DIR) Necessary include paths are added only in VPATH mode. Dependencies are stored in the build directory now. They contain paths which depend on the current build, and therefore they are not general. Fixed two dependencies in main/Makefile.in.

Most of the support programs are created during the build, so we can expect them to be in $(builddir).

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)

Cleanup more files when make distclean is used. This should be all the files that should be cleaned.

Install the support binaries.

Add the support directory back into the build process.

Fix the progname stuff to work the same way the rest of the configure scheme works. Submitted by: Sascha Schumann Reviewed by: Ryan Bloom

If a developer uses --with-program-name=foo, the config files are renamed to match the name of the executable. In this example, httpd.conf will be renamed to foo.conf.

Allow the Apache-2.0 executable name to be specified with the --with-program-name command line argument to configure. This does not change the name of the config files or anything else, yet.

Under OS/2 (well actually EMX gcc) libraries don't have a 'lib' prefix. In main code libtool handles it. This deals with APR.

Change the name from apache back to httpd.

Minor nit: use top_srcdir instead of topsrcdir, to be more consistent with autoconf.

even more distclean goodness (there's still more... time for zzz though)

it's more traditional in autoconf projects for "make distclean" to clean up things such as the apaci script, rather than "make clean".

Part of a fix for not being able to reset the --prefix. This will allow the installation prefix to be reset after a "make clean". To do this really properly, all the code that depends on the prefix should have a dependency in the makefile. This is coming RSN.

These changes are committed together, because they depend on each other. - shared modules can be built in the tree - added support for --with-layout, uses APACI's config.layout - working 'make install' - working 'make depend' - working Pthreads checks - buildconf replaced