Parent Directory
| 
Revision Log
| Links to HEAD: | (view) (annotate) |
| Sticky Revision: |
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
general property cleanup
First pass at trying to standardize httpd-2.0's usage of APR and APR-util so that they can be separated - use an installed APR and APR-util with httpd-2.0. This is not expected to achieve full separation, but is merely the first step in the process. The tree should still be buildable in the source-only case. This commit does the following things: - Use the standard find_apr.m4 and find_apu.m4 m4 macro files that flood and Subversion already use for locating APR and APR-util. This adds the --with-apr and --with-apr-util configure options. - Stop using APRVARS and export_vars.sh. - Use apr-config and apu-config to determine dependencies. - Add AP_BUILD_SRCLIB_DIRS and AP_CLEAN_SRCLIB_DIRS values (names stink) to dynamically figure out what subdirs in srclib we will build. (What we really want to do is set one value - go L->R on build and R->L on clean. I can't think of a way to do this.) - If we are using APR and APR-util that are already installed, don't specify them in srclib. (This still needs some work I bet.)
Whoops, didn't mean to get rid of the whole line.
This old variable does not appear to be in use any longer.
rules.mk is stored in $(top_blddir). Without this change, VPATH builds stop working.
Allow us to build APR before APR-util, but clean APR-util before APR. This should fix the build for BeOS.
With my normal sense of missing the boat :) This gets the build working on BeOS again :) Apologies for the delay :( Jeff changed the order of apr-util and apr to solve a "cleaning" issue but that makes me uncomfortable as apr-util is dependant on apr, so if we clean apr-util we shouldn't be altering anything in apr. If I decide to rebuild apr-util then apr should still be buildable. Sorry Jeff but I think we need a different solution :( Submitted by: Peter Schultz <pete@beforever.com>
get "make extraclean" working for apr-util again the apr-util build now depends on files in apr; "make extraclean" in apr removes some of those files, causing a subsequent "make extraclean" in apr-util to blow*; make in apr-util first so we don't have this problem *on some platforms make aborted; on others the error was ignored though apr-util wasn't cleaned
We need to build expat-lite before APR-utils, so just move that variable to before apr-util.
Add apr-util to the build process. This should now build once everything has been checked out to the correct locations.
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.
missed one. This is needed to build the new aputil library.
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
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.
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)
Minor nit: use top_srcdir instead of topsrcdir, to be more consistent with autoconf.
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
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 |