Commit Graph

87 Commits

Author SHA1 Message Date
21e6989f8d apxs: Fix -i for some cases where -n is not used.
The $base was already stripped of suffix in typical case.

Submitted by: Jan Pazdziora <jpazdziora redhat.com>
Github: closes #359


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1910841 13f79535-47bb-0310-9956-ffa450edef68
2023-07-07 07:57:35 +00:00
6b02123ee4 silence an "uninitialized value" warning
bz 63307


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875534 13f79535-47bb-0310-9956-ffa450edef68
2020-03-23 07:08:16 +00:00
2e40c1b25b fix apxs for non-destdir builds
subtr(...,0, -1) chops off a character and leaves relative path.

(you will need to re-run configure)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875429 13f79535-47bb-0310-9956-ffa450edef68
2020-03-19 15:50:18 +00:00
388adb0821 Allow instdso.sh to be found while cross compiling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872062 13f79535-47bb-0310-9956-ffa450edef68
2019-12-28 15:33:32 +00:00
c7d7b6d1a3 Add support for cross compiling to apxs. If apxs is being executed from somewhere
other than its target location, add that prefix to includes and library directories.
Without this, apxs would fail to find config_vars.mk and exit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872042 13f79535-47bb-0310-9956-ffa450edef68
2019-12-27 23:00:53 +00:00
9f238af57d Remove unused APXS setting from template for generated Makefile
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1535699 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 11:36:00 +00:00
49efa827aa Make apxs use LDFLAGS from config_vars.mk in addition to CFLAGS and CPPFLAGS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1343094 13f79535-47bb-0310-9956-ffa450edef68
2012-05-27 20:39:14 +00:00
57df737005 Support AP_DECLARE_MODULE declaration syntax in apxs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956956 13f79535-47bb-0310-9956-ffa450edef68
2010-06-22 17:12:44 +00:00
05f09e8db8 apxs -q: Stop filtering out ':' characters from the reported values.
PR: 45343
Submitted by: Bill Cole <apachebugz-20090909 billmail.scconsult.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@944383 13f79535-47bb-0310-9956-ffa450edef68
2010-05-14 18:44:48 +00:00
1f82bc7da1 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)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@942209 13f79535-47bb-0310-9956-ffa450edef68
2010-05-07 20:36:14 +00:00
8725d94311 Remove useless use of $[, which was long deprecated and is an error with perl 5.12rc3.
Submitted by: Roderich Schupp <roderich schupp googlemail com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@932791 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 20:54:37 +00:00
60fbe11de1 Bring back OS/2 support.
Reverses r758929 with a little bit of conflict resolution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 08:56:13 +00:00
ee32468a33 remove OS/2 platform support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758929 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:47:52 +00:00
e427a7cb63 * Teach apxs to work with APR 2.x where there is no separate APR-UTIL
any longer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758167 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 07:31:56 +00:00
b4aaa589af apxs: Enhance -q flag to print all known variables and their values
when invoked without variable name(s). 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@502323 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 19:31:41 +00:00
f3ee5c3736 * 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@494781 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 10:50:35 +00:00
44fa6e0073 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420990 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:55:32 +00:00
ebe24d48c7 Update the last year of copyright.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395229 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:23:42 +00:00
30d100bceb * 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@189928 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 09:18:14 +00:00
10d2058ea4 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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170383 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 13:03:35 +00:00
1c8f208558 Did not belong in r170253; evalute this patch seperately from
the win32 /Oy- patch.  Will recommit for seperate discussion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170380 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 12:59:34 +00:00
20d06d7a06 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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
bc2d677ed2 * 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)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105310 13f79535-47bb-0310-9956-ffa450edef68
2004-09-28 14:30:10 +00:00
70ed655fa8 * 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105309 13f79535-47bb-0310-9956-ffa450edef68
2004-09-28 13:09:37 +00:00
84b6512fc8 * 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104641 13f79535-47bb-0310-9956-ffa450edef68
2004-08-13 09:38:11 +00:00
252e7ae86c 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.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104443 13f79535-47bb-0310-9956-ffa450edef68
2004-08-02 02:38:16 +00:00
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
c0dcb76491 fix copyright dates according the first cehck in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102592 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 14:14:53 +00:00
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
a7f1773e89 this won't work with 5.003, so bump up the require to
5.004:

  my $cntopen = () = ($before =~ m|^\s*<[^/].*$|mg);


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101296 13f79535-47bb-0310-9956-ffa450edef68
2003-09-19 19:55:16 +00:00
5cbcc8cf8f 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99981 13f79535-47bb-0310-9956-ffa450edef68
2003-05-21 06:56:35 +00:00
a0fdb69ddd 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99213 13f79535-47bb-0310-9956-ffa450edef68
2003-04-04 19:04:21 +00:00
39acf656ed break down the beast and explain the obvious >:->
Also catch the case that the substitution may fail.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98730 13f79535-47bb-0310-9956-ffa450edef68
2003-02-19 14:39:39 +00:00
bb51a76b79 insert LoadModule directives only outside of sections.
PR: 9012


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98721 13f79535-47bb-0310-9956-ffa450edef68
2003-02-19 03:01:21 +00:00
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
7843242181 apxs: Include any special APR ld flags when linking the DSO.
This resolves problems on AIX when building a DSO with apxs+gcc.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98469 13f79535-47bb-0310-9956-ffa450edef68
2003-01-23 11:54:44 +00:00
cc1c7ffe8d 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.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98102 13f79535-47bb-0310-9956-ffa450edef68
2002-12-23 19:21:15 +00:00
7686499ced 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97820 13f79535-47bb-0310-9956-ffa450edef68
2002-12-09 15:00:59 +00:00
28bcef27bb 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.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96905 13f79535-47bb-0310-9956-ffa450edef68
2002-09-19 05:43:16 +00:00
803bf93dbe Add -p option to apxs to allow unbundled modules (such as mod_mbox) to
compile and link helper programs that use apr/apr-util.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96900 13f79535-47bb-0310-9956-ffa450edef68
2002-09-19 01:06:17 +00:00
5cc7007688 Remove following warning:
Use of uninitialized value in string eq at ./apxs line 134.

when the last option in getopt array is used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96899 13f79535-47bb-0310-9956-ffa450edef68
2002-09-19 00:57:35 +00:00
27a37af0e2 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>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96317 13f79535-47bb-0310-9956-ffa450edef68
2002-08-07 12:35:03 +00:00
12ce0408cd Fix some variable names
Submitted by:  Brian Degenhardt <bmd@mp3.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95814 13f79535-47bb-0310-9956-ffa450edef68
2002-06-19 20:44:45 +00:00
9b010e96b3 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95646 13f79535-47bb-0310-9956-ffa450edef68
2002-06-13 17:06:04 +00:00
d0be7a27e2 Fix apxs to allow "apxs -q installbuilddir" and to allow
querying certain other variables from config_vars.mk.

PR:    9316


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95549 13f79535-47bb-0310-9956-ffa450edef68
2002-06-06 18:16:08 +00:00
1710d9a47b 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95530 13f79535-47bb-0310-9956-ffa450edef68
2002-06-05 19:08:55 +00:00
20235e3688 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95522 13f79535-47bb-0310-9956-ffa450edef68
2002-06-05 11:59:26 +00:00
75be359002 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.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95065 13f79535-47bb-0310-9956-ffa450edef68
2002-05-13 17:16:55 +00:00