Remove unused APXS setting from template for generated Makefile

Make apxs use LDFLAGS from config_vars.mk in addition to CFLAGS and CPPFLAGS

Support AP_DECLARE_MODULE declaration syntax in apxs

apxs -q: Stop filtering out ':' characters from the reported values. PR: 45343 Submitted by: Bill Cole <apachebugz-20090909 billmail.scconsult.com>

Fix the following: $> grep -e autoindex_ -e cgi_ httpd.conf LoadModule autoindex_module libexec/apache22/mod_autoindex.so LoadModule cgi_module libexec/apache22/mod_cgi.so fire up the following commands $> apxs -e -a -n autoindex mod_autoindex.so [activating module `autoindex' in /usr/local/etc/apache22/httpd.conf] $> apxs -e -a -n cgi mod_cgi.so [activating module `cgi' in /usr/local/etc/apache22/httpd.conf] This will result into the following httpd.conf $> grep -e autoindex_ -e cgi_ httpd.conf LoadModule autoindex_module libexec/apache22/mod_autoindex.so LoadModule cgi_module libexec/apache22/mod_cgi.so LoadModule autoindex_module libexec/apache22/mod_autoindex.so LoadModule cgi_module libexec/apache22/mod_cgi.so As you notice the modules are now loaded twice Now try to deactivate for the loaded ssl module $> grep ssl_ httpd.conf LoadModule ssl_module libexec/apache22/mod_ssl.so $> apxs -e -A -n ssl mod_ssl.so [preparing module `ssl' in /usr/local/etc/apache22/httpd.conf] $> grep ssl_ httpd.conf LoadModule ssl_module libexec/apache22/mod_ssl.so #LoadModule ssl_module libexec/apache22/mod_ssl.so As reported in FreeBSD ports PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/133704 Previously discussed with: wrowe@ This b/c '$lmd' expects the amount of space to be a fixed amount. Use \s+ to make any valid httpd.conf syntax work (i.e. at least 1 space)

Remove useless use of $[, which was long deprecated and is an error with perl 5.12rc3. Submitted by: Roderich Schupp <roderich schupp googlemail com>

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

remove OS/2 platform support

* Teach apxs to work with APR 2.x where there is no separate APR-UTIL any longer.

apxs: Enhance -q flag to print all known variables and their values when invoked without variable name(s).

* configure.in: Substitute MOD_SO_ENABLED variable. * support/apxs.in: Use it to eliminate run-time check for whether httpd has mod_so built-in. Submitted by: David M. Lee <dmlee crossroads.com> PR: 40653

update license header text

Update the last year of copyright.

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

One issue I repeatedly have with 3rd party module builds is that they may choose to build a platform-default library with the usual platform-default extension, as part of the compilation process. Modules built on HP/UX with the .sl extension, on OSX with .dylib, or on OS2 or Win32 with .dll are perfectly legitimate loadable modules, but don't pass muster with apxs. This patch allows any of the common source library extensions to be passed in, but makes .so the explicit target. The behavior already works for .la origin files with an .so target name.

Did not belong in r170253; evalute this patch seperately from the win32 /Oy- patch. Will recommit for seperate discussion.

Reintroduce stack frame construction with /Oy- (removal was implied by /O2). This makes binaries far easier to debug, during operation and for post-crash .dmp analysis. Do not alter /Gs optimizations per brane. Reviewed by: stoddard, brane

Update copyright year to 2005 and standardize on current copyright owner line.

* support/apxs.in: Ensure that only a .la target filename is passed on the libtool link line otherwise libtool tries to link statically. PR: 31448 (more)

* support/apxs.in: Reset $opt so that -I, -D and -Wc,* options are not passed to the libtool link line. For "-Wl,-foo" pass "-foo" on the link line regardless of whether gcc is used; without guessing whether libtool --mode=link will invoke gcc or some native ld the previous behaviour is not really correct. PR: 31448

* configure.in, acinclude.m4: Substitute AP[RU]_CONFIG with location of installed ap[ru]-config scripts so third-party modules can use `apxs -q APR_CONFIG`. * support/apxs.in: Use new AP[RU]_CONFIG variables; use apr-config --apr-libtool.

Teach apxs how to find ap{ru}-$AP{RU}_MAJOR_VERSION-config (httpd-2.1+ will be APR 1.0 or higher which uses this convention.)

fix name of The Apache Software Foundation

fix copyright dates according the first cehck in

apply Apache License, Version 2.0

update license to 2004.

this won't work with 5.003, so bump up the require to 5.004: my $cntopen = () = ($before =~ m|^\s*<[^/].*$|mg);

Perform run-time query in apxs for apr and apr-util's includes. This is required when they are in disjoint directories from httpd. Otherwise, apxs won't pass their include information into the compiler and the compilation will fail.

run libtool from the apr install directory (in case that is different from the apache install directory) further changes are needed to automatically pick up apr and apr-util include directories; for now, "-Wc,-I/path" needs to be added to the apxs -c invocation to work around that problem

break down the beast and explain the obvious >:-> Also catch the case that the substitution may fail.

insert LoadModule directives only outside of sections. PR: 9012

finished that boring job: update license to 2003. Happy New Year! ;-))

apxs: Include any special APR ld flags when linking the DSO. This resolves problems on AIX when building a DSO with apxs+gcc.

Sun Forte requires having the same CFLAGS passed to the link stage as was passed to the compile stage. (Otherwise, it won't link the threaded APR right.)

If an httpd.conf has commented out AddModule directives, apxs -i -a will add an un-commented AddModule directive for the new module, which breaks the config. PR: 11212 Obtained from: Submitted by: Joe Orton Reviewed by: Bill Stoddard, Thom May

Rework the apxs -cp command to work when the source dir isn't available by querying apr-config and apu-config at link-time instead. (Note that the $apr_config value in configure.in isn't sufficient as we need to know where apr-config will be when we execute apxs later on - hence the --bindir option to apr-config and apu-config.)

Add -p option to apxs to allow unbundled modules (such as mod_mbox) to compile and link helper programs that use apr/apr-util.

Remove following warning: Use of uninitialized value in string eq at ./apxs line 134. when the last option in getopt array is used.

apxs lost the newline at the end of print "$result", so that apxs -q doesn't return anything. Submitted by: Thom May <thom@planetarytramp.net>

Fix some variable names Submitted by: Brian Degenhardt <bmd@mp3.com>

avoid a non-portable shell construct ("builddir=$(shell pwd)") so that the makefile created by apxs -g works on more systems it was broken on at least AIX and Tru64

Fix apxs to allow "apxs -q installbuilddir" and to allow querying certain other variables from config_vars.mk. PR: 9316

Get rid of some uninitialized value errors with apxs -q. Submitted by: Stas Bekman <stas@stason.org> Reviewed by: Heinrich G�tzger <goetzger@gmx.net>, Cliff Woolley

Fix apxs to allow it to work when the build directory is somewhere besides server-root/build. PR: 8453 Submitted by: a number of people hit this problem and offered hints or partial fixes; Thom May and Pier Fumagalli had a patch to apxs, a subset of which mostly fixed this problem; there were hints in PRs 8453 and 9316

Make apxs look in the correct directory for envvars. It was broken when sbindir != bindir. PR: 8869 Submitted by: Andreas Sundstr�m <sunkan@zappa.cx> Reviewed by: Jeff Trawick (This fix has been posted by others too.)

finish getting apxs to work with a binary build it now picks up any necessary ld environment variables from the envvars file when invoking "httpd -l" to verify that mod_so was included in the build

Update our copyright for this year.

get some hardcoded paths out of apxs PR: 10163 (but PR isn't completely solved with this commit)

apxs: Let the LTFLAGS environment variable override the default --silent flag. Previously you had to edit the generated apxs to get rid of --silent.

SH_LDFLAGS wasn't getting evaluated properly when it included makefile variables but, we stopped needing SH_LDFLAGS in apxs on AIX since we switched to run-time linking and I never found out for sure that the use of SH_LDFLAGS actually helped BeOS or OS/390, so I'm yanking out the reference to SH_LDFLAGS if/when we need such a thing in apxs, we'll have a new variable so we can distinguish between special flags needed for Apache core DSOs (which might have stuff specific to some Apache core DSO that was discovered during Apache configurat) vs. special flags needed by any DSO PR: Obtained from: Submitted by: Reviewed by:

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

Allow apxs to be used to build DSOs on AIX without requiring the user to hard-code the list of import files. (This should help on OS/390 and BeOS as well.) Trivial change: just stick the value of SH_LDFLAGS on the libtool --mode=link line.

apxs should be using sbindir not bindir for the path to the httpd binary. Committed with some minor changes. Submitted by: GOMEZ Henri <hgomez@slib.fr> Reviewed by: Justin Erenkrantz

fix eval of vars incase string has quotes example: CFLAGS = -DSUEXEC_BIN='"bin/suexec" PR: Obtained from: Submitted by: Reviewed by:

We need to use the APR-generated libtool for building modules.

strip parens from config_vars.mk values

gather all of the cflags for compiling with apxs

Remove some debug code that I had in apxs.in. Submitted by: Karl Fogel <kfogel@collab.net>

- allows empty $val from httpd-2.0/build/config_vars.mk - make code more perlish. - read and parse the config file only once - use a hash instead of array for the list of internal config vars to test against - added -h option (just print usage) - wrapped numerous print STDERR calls into a simpler error() and notice() subs - simplified some of the logic in if's using perl constructs. Submitted by: Stas Bekman <stas@stason.org>

More fixes for APXS. APXS now works with httpd-test again

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.

apxs no longer generates ap_send_http_header() in the example handler

Return missing link flags to apxs.in Submitted by: Harrie Hazewinkel <harrie@covalent.net>

backing out this part of the recent apxs change otherwise `apxs -q INCLUDEDIR' is broken using the default layout PR: Obtained from: Submitted by: Reviewed by:

Fix APXS: treat sbindir as expected, fix "link" command. Submitted by: GOMEZ Henri <hgomez@slib.fr>

Update copyright to 2001

s/LAST/MIDDLE/

adjust to ap_hook_handler changes

Stop searching in installdir/includes/apr.

Add the ability for apxs to install both libtool generated and non-libtool generated shared objects. Submitted by: Jon Travis <jtravis@covalent.net> Reviewed by: Ryan Bloom

The LoadModule line should specify a .so file, not a .la file

Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper) and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE. All _VAR_ flavors changes to _DATA to be absolutely clear. Thank you Greg, for the most obvious suggestion.

allow apxs to be run from the source tree, before installation (e.g. perl ../apache-2.0/src/support/apxs -q CFLAGS)

Fix a stupid mistake in apxs.in. Submitted by: Greg Stein

Make apxs mostly work for 2.0. It doesn't add the module to the config file yet, but that should be trivial to add back in.

Back out an inadvertant change to apxs.

Port reliable piped logs to mpmt_pthread and dexter. Also a couple of small cleanups for reliable piped logs.

Update to Apache Software License version 1.1

Fix all the License issues. Including: s/Apache Group/Apache Software Foundation/ s/1999/2000/ s/Sascha's license/ASF license

If we can't open httpd.conf, print a warning, but don't die. Otherwise, you can't install a module into a package root.

Perform check for "$CFG_SBINDIR/$CFG_TARGET" _after_ the command line overrides for CFG_SBINDIR and CFG_TARGET have been evaluated.

Apache 1.3.9 baseline for the Apache 2.0 repository. Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9 Submitted by: Apache Group