1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

244 Commits

Author SHA1 Message Date
Jeff Trawick
3a2b57187a 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.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93923 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 03:16:50 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Bradley Nicholes
8c80929722 Fixed the slashes on the server root path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93868 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 21:01:46 +00:00
Bradley Nicholes
77c4a4337f NetWare AWK script for producing the shipping version of the HTTPD.conf
file from the template


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93715 13f79535-47bb-0310-9956-ffa450edef68
2002-03-05 19:55:32 +00:00
Bradley Nicholes
e6d10bff2d Switching from a project build file to GNU make files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93665 13f79535-47bb-0310-9956-ffa450edef68
2002-03-01 22:21:25 +00:00
Jeff Trawick
421c580059 on OS/390, instdso.sh should just use libtool, since libtool for
OS/390 is very Apache-friendly and doesn't play with the names
of DSO files


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93518 13f79535-47bb-0310-9956-ffa450edef68
2002-02-20 20:11:32 +00:00
Bradley Nicholes
a9ee1264bb Added the renaming of apr_ldap.hnw to the prebuild precessing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93340 13f79535-47bb-0310-9956-ffa450edef68
2002-02-08 19:17:26 +00:00
Aaron Bannert
b9351f186b Allow statically linked support binaries with the new
--enable-static-support flag, and enable this behavior in
the binbuild script. Also add a new --enable-static-htdbm
flag.

BTW, this takes care of 7/8th of a showstopper.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93331 13f79535-47bb-0310-9956-ffa450edef68
2002-02-07 23:01:47 +00:00
Jeff Trawick
6c51d3c9d0 binbuild.sh: Make sure that we use the expat from our source
tree so that there aren't any surprises on the target machine.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93184 13f79535-47bb-0310-9956-ffa450edef68
2002-02-02 20:30:03 +00:00
Bradley Nicholes
c14c091742 Added symbol prefixing to the export list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93033 13f79535-47bb-0310-9956-ffa450edef68
2002-01-25 23:38:01 +00:00
Bradley Nicholes
951a0cbf39 Updated to reference the NovellLibC environment variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92861 13f79535-47bb-0310-9956-ffa450edef68
2002-01-15 23:37:38 +00:00
Jeff Trawick
eb4ec0cefb Allow mod_cgid to work from a binary distribution install by
using 755 for the permissions on the log directory instead of
750.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92826 13f79535-47bb-0310-9956-ffa450edef68
2002-01-11 13:20:55 +00:00
Bradley Nicholes
f5cfd12c02 Fixed the export list generation for NetWare to make sure that only real APIs
are being exported


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92777 13f79535-47bb-0310-9956-ffa450edef68
2002-01-08 21:46:18 +00:00
Jeff Trawick
a7dee62289 fix a typo in an error message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92762 13f79535-47bb-0310-9956-ffa450edef68
2002-01-07 16:03:25 +00:00
Brian Havard
ac17c58a40 OS/2: Supply the configured libraries to the linker when building loadable
modules. This allows things like mod_deflate to build (needs -lz).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92663 13f79535-47bb-0310-9956-ffa450edef68
2001-12-30 14:05:55 +00:00
Jeff Trawick
50c4895907 Pick up Brad Nicholes' old fix so that make_exports.awk can handle
AP_HOOK invocations which span lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92563 13f79535-47bb-0310-9956-ffa450edef68
2001-12-21 13:50:41 +00:00
Brian Havard
a8d6b1fc9d Use aplibtool to install modules on OS/2 as it contains some required magic
to handle DLL naming restrictions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92553 13f79535-47bb-0310-9956-ffa450edef68
2001-12-21 01:47:50 +00:00
Jeff Trawick
51fde2472b get proxy-as-DSO to load on AIX by fixing up some of our symbol grokking
make_exports.awk didn't handle AP_CORE_DECLARE and it didn't look in
modules/http/*.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92548 13f79535-47bb-0310-9956-ffa450edef68
2001-12-20 16:19:50 +00:00
Jeff Trawick
1f5c20551c get binbuild to do the right thing with envvars (install/edit as
appropriate)

fix a problem in the load-library-path setting (wrong kind of
quotes were used)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92494 13f79535-47bb-0310-9956-ffa450edef68
2001-12-15 21:50:19 +00:00
Jeff Trawick
8e73a781d0 handle the envvar file properly in install-bindist.sh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92492 13f79535-47bb-0310-9956-ffa450edef68
2001-12-15 18:15:52 +00:00
Jeff Trawick
6a6e3a2218 take over DSO installation from libtool on all platforms, for both
"make install" and "apxs -i"

since we don't link with Apache DSOs we don't need the .la files

since we load Apache DSOs with explicit path information we don't
need any other system-specific magic to be performed


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92479 13f79535-47bb-0310-9956-ffa450edef68
2001-12-14 12:29:37 +00:00
Bradley Nicholes
e813d9ea38 Excluding macros from the export list output
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92430 13f79535-47bb-0310-9956-ffa450edef68
2001-12-11 19:37:11 +00:00
Greg Ames
c3dac7ca6c revert back to using a "links" downloaded version of our FAQ with an
up-to-date URL.  The FAQ included in httpd-2_0_28 isn't very pretty
because it wasn't parsed by mod_include as part of the roll script.
Add a comment explaining why this is necessary.

with this change, there's no reason to run expand.pl twice.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92428 13f79535-47bb-0310-9956-ffa450edef68
2001-12-11 19:28:38 +00:00
Aaron Bannert
36f24fc781 Another fix for VPATH builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92413 13f79535-47bb-0310-9956-ffa450edef68
2001-12-10 23:53:23 +00:00
Jeff Trawick
210d01fd95 Do special install processing for Apache DSO modules on HP-UX, Tru64,
and AIX so that we get mod_foo.so installed instead of the stuff that
libtool installed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92370 13f79535-47bb-0310-9956-ffa450edef68
2001-12-07 17:48:36 +00:00
Greg Ames
f967c4ff54 change binbuild.sh to use --enable-mods-shared=most. This adds 13 modules
to the build.

Thanks again to Aaron for fixing this configure option.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92369 13f79535-47bb-0310-9956-ffa450edef68
2001-12-07 15:55:23 +00:00
Greg Ames
8d4ef324f4 get binbuild working when apr, apr-util, and expat are built shared in
directories that are not well known to the loader.

How it works:
* libtool figures out the name of this system's library path environment
  variable (i.e. LD_LIBRARY_PATH, LIBPATH, DYLD_LIBRARY_PATH) at apr
  configure time (existing code)
* save this variable name in SHLIBPATH_VAR in APRVARS
* substitute this name when apachectl is created
* uncomment the lines containing this variable during binbuild
* install_bindist.sh updates the path to lib/ when the binary is
  installed (existing code)

not done yet, but a good idea:
* create a file or directory containing all environment variable settings
  for apachectl.  Others env vars need to be tweaked, at least on AIX and
  OS/390, so keeping them separate should reduce headaches long term.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92299 13f79535-47bb-0310-9956-ffa450edef68
2001-12-03 18:00:04 +00:00
Bradley Nicholes
033b401245 Sync'ed the NetWare export AWK script to the Unix script
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92268 13f79535-47bb-0310-9956-ffa450edef68
2001-11-30 22:29:41 +00:00
Bradley Nicholes
d826a37ea4 Switched to a NetWare version of APU.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92265 13f79535-47bb-0310-9956-ffa450edef68
2001-11-30 19:07:09 +00:00
Greg Ames
5c3b351143 copy the lib/ directory when installing a binary.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92261 13f79535-47bb-0310-9956-ffa450edef68
2001-11-30 15:35:22 +00:00
William A. Rowe Jr
f320eab08f Ingorance is bliss
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92257 13f79535-47bb-0310-9956-ffa450edef68
2001-11-30 02:50:05 +00:00
Greg Ames
90a8cc2a20 install our manual in the new location
also, pick up an edit I missed last time around...whoops!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92248 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 14:18:06 +00:00
Greg Ames
4b090b19b3 begone, ugly echoed seds. Use build/install-bindist.sh.in as a template
to create install-bindist.sh


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92228 13f79535-47bb-0310-9956-ffa450edef68
2001-11-28 22:25:10 +00:00
Greg Ames
27cf16fd50 new file for use with binbuild.sh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92227 13f79535-47bb-0310-9956-ffa450edef68
2001-11-28 22:20:00 +00:00
Greg Ames
4916acab59 get binbuild.sh working enough to create a binary which serves the It Works!
page

* change seds for apachectl and httpd*.conf to do the right thing
* use /usr/local/apache2 for the default install directory
* use a shell variable for the above, in case it needs to change again
* use httpd-std.conf in place of httpd.conf.default
* get rid of the httpd -R option in apachectl (not valid in 2.0)
* don't overlay httpd.conf if it already exists (1.3 does this - wtf?!?!)

not done in this commit:

* install manual/ and error/ correctly
* switch to --enable-mods-shared=most now that it works (thanks, aaron!)
* investigate weird behavior when .tar.gz already exists in parent dir
* investigate setting a Group directive that actually works in httpd*.conf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92223 13f79535-47bb-0310-9956-ffa450edef68
2001-11-28 19:41:07 +00:00
Jeff Trawick
d577f88da9 recognize the symbols generated by APR_POOL_DECLARE_ACCESSOR() so
that exports.c and the .exp files have the necessary references


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92207 13f79535-47bb-0310-9956-ffa450edef68
2001-11-28 00:58:12 +00:00
Bradley Nicholes
4e3aa6d7da Fixed the AWK script so that it will pick up functions that have been
declared on multiple lines such as create_connection in connection.h.
Otherwise multi-line declared functions are omitted from the export list.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92044 13f79535-47bb-0310-9956-ffa450edef68
2001-11-19 23:33:15 +00:00
Greg Ames
7a6a9c2f46 copy the faq from the correct directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91826 13f79535-47bb-0310-9956-ffa450edef68
2001-11-10 01:34:13 +00:00
Greg Ames
af307bc8a9 update the location of the FAQ, and a few other misc. changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91803 13f79535-47bb-0310-9956-ffa450edef68
2001-11-08 15:38:38 +00:00
Ryan Bloom
0979604903 Stop removing the test directories when rolling a build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91766 13f79535-47bb-0310-9956-ffa450edef68
2001-11-06 16:25:52 +00:00
Bradley Nicholes
60d882ff59 Consolidated the APR imports to a single import file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91728 13f79535-47bb-0310-9956-ffa450edef68
2001-11-02 17:56:14 +00:00
Jeff Trawick
5988a24d36 make shared libraries executable so they work on HP-UX
(I'm not sure that this logic for copying DSOs will survive
in the libtool scheme; I'm putting this 1.3 fix in just in
case.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91675 13f79535-47bb-0310-9956-ffa450edef68
2001-10-27 14:01:13 +00:00
Bradley Nicholes
3f30099c48 More cleanup on the pre-build script
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91659 13f79535-47bb-0310-9956-ffa450edef68
2001-10-25 15:37:53 +00:00
Bradley Nicholes
d03056bbf5 Modified to correctly extract the export lists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91653 13f79535-47bb-0310-9956-ffa450edef68
2001-10-23 23:29:50 +00:00
Bradley Nicholes
3050920e9d Scripts for setting up the build environment and generating the import lists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91638 13f79535-47bb-0310-9956-ffa450edef68
2001-10-22 18:29:45 +00:00
Aaron Bannert
e177d373be 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91492 13f79535-47bb-0310-9956-ffa450edef68
2001-10-16 17:51:11 +00:00
Ryan Bloom
1fc2c385f0 rules.mk is found in the build directory, not the src dir.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91025 13f79535-47bb-0310-9956-ffa450edef68
2001-09-14 17:43:03 +00:00
Ryan Bloom
89f6a1f850 rules.mk is found in the builddir now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91023 13f79535-47bb-0310-9956-ffa450edef68
2001-09-13 20:54:33 +00:00
Ryan Bloom
dba117607b This broke the build. Looking for a clean solution now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91020 13f79535-47bb-0310-9956-ffa450edef68
2001-09-13 16:58:20 +00:00
Ryan Bloom
5a68f25cae Gotta find rules.mk in the build directory, not the source.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91019 13f79535-47bb-0310-9956-ffa450edef68
2001-09-13 15:57:03 +00:00