1
0
mirror of https://github.com/apache/httpd.git synced 2025-09-02 13:21:21 +03:00
Commit Graph

97 Commits

Author SHA1 Message Date
Jeff Trawick
f6bdcb2e0a Get "make install" to work on Tru64.
With Tru64, make picks up a bad status from the child shell process
when it evaluates the "`echo ($static) | grep 'mod_so'` (see below),
causing make to bail out.

But that grep should always fail when "make install" runs in
modules/extra and unless we have mod_so it will fail when "make
install" runs in modules/standard.

The work-around is to explicitly ignore the exit status from the
grep.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86959 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 12:00:44 +00:00
Ryan Bloom
1eda38942e Fix type complaints on Xlc.
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86939 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 16:26:42 +00:00
Jeff Trawick
91976ba707 Prevent a compile warning on FreeBSD by making pointers const (only needed
for data, but not harmful for functions)

old warning: "exports.c:59: warning: initialization discards `const' from pointer target type"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86784 13f79535-47bb-0310-9956-ffa450edef68
2000-11-01 13:03:01 +00:00
Ryan Bloom
511d2c481c This is an ugly little hack to allow DSO modules to work. This basically
forces Apache to link in all of the APR functions whether they are used
by any static modules or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86770 13f79535-47bb-0310-9956-ffa450edef68
2000-10-30 23:08:27 +00:00
Greg Stein
c69699eea6 use a cleaner form for building the TAR file
Submitted by: Joe Orton
Reviewed by: Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86713 13f79535-47bb-0310-9956-ffa450edef68
2000-10-23 15:48:00 +00:00
Sascha Schumann
804a7c1eb9 Add logic to rebuild mm's configure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86704 13f79535-47bb-0310-9956-ffa450edef68
2000-10-22 15:37:05 +00:00
William A. Rowe Jr
d6490633eb 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86609 13f79535-47bb-0310-9956-ffa450edef68
2000-10-16 06:05:15 +00:00
Ryan Bloom
73369a1dce Back out the build changes I added last night. This was causing libtool
commands to be sent to gcc.  It worked on some platforms, but not all of
them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86404 13f79535-47bb-0310-9956-ffa450edef68
2000-10-05 17:28:45 +00:00
Ryan Bloom
8d4c54143f Multiple build and configuration fixes
Build process:

  -add datadir and localstatedir substitutions
  -fix layout name
  -fix logfilename misspelling
  -fix evaluation of installation dir variables and
  -replace $foobar by $(foobar) to be usefull in the makefile

Cross compile:

  -add rules for cross-compiling in rules.mk. Okay, rule to check for
   $CC_FOR_BUILD is still missing
  -use CHECK_TOOL instead of CHECK_PROG for ranlib
  -add missing "AR=@AR@" to severaly Makefile.in's
  -cache result for "struct rlimit"
  -compile all helper programs with native and cross compiler
   and use the native version to generate header file


PR:	6384
Submitted by:	"R�diger" Kuhlmann <Tadu@gmx.de>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86399 13f79535-47bb-0310-9956-ffa450edef68
2000-10-05 05:42:06 +00:00
Ryan Bloom
bee0cc4f31 If mod_so is compiled into the server, we need to create libexec, even
if there are no shared modules compiled.  This is in keeping with what
we did with Apache 1.3, and it allows APXS to work, even if there were no
shared modules installed initially.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86396 13f79535-47bb-0310-9956-ffa450edef68
2000-10-05 03:44:22 +00:00
Sascha Schumann
1008581089 Redirect stderr to /dev/null to suppress error messages.
Submitted by:	Ralf Engelschall <rse@engelschall.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86333 13f79535-47bb-0310-9956-ffa450edef68
2000-09-26 11:24:56 +00:00
Sascha Schumann
137b9009a0 Workaround for systems like BSD/OS without mktemp.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86306 13f79535-47bb-0310-9956-ffa450edef68
2000-09-23 13:55:37 +00:00
Sascha Schumann
364208ae64 Pedant of bsd_makefile. Reverses the include directives to SysV-style.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86304 13f79535-47bb-0310-9956-ffa450edef68
2000-09-23 08:39:34 +00:00
Sascha Schumann
8c5ede4d63 Don't use $0 for creating tmpfile as it will contain "/".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86303 13f79535-47bb-0310-9956-ffa450edef68
2000-09-23 08:37:23 +00:00
Sascha Schumann
7cb5b58676 Add Convert-to-BSD-Makefiles-On-The-Fly system
Note 1: Only needed for BSD/OS.
Note 2: Invent better heuristic (timestamp checks for build/*.mk).
Note 3: Conversion is currently one-way
Note 4: Don't package on BSD/OS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86284 13f79535-47bb-0310-9956-ffa450edef68
2000-09-22 17:07:47 +00:00
Ryan Bloom
9042b817bd Fix the ScanDoc output on IE. I don't have IE, so I can't test this, but
it looks correct, and this problem has been submitted to me multiple times
PR: 6501
Submitted by:	 Shuichi Kitaguchi <ki@hh.iij4u.or.jp>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86173 13f79535-47bb-0310-9956-ffa450edef68
2000-09-06 14:02:29 +00:00
Ryan Bloom
55179b5a0f Remove whitespace from blank lines in rules.mk. This fixes Irix 6.5
PR:	6357
Submitted by:	Mike Abbott <mja@sgi.com>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86107 13f79535-47bb-0310-9956-ffa450edef68
2000-08-19 00:34:38 +00:00
Ryan Bloom
9ca6d014a3 Fix a minor bug in the default template file. The template used to not
escape the spaces in file names.  It does now.  This also adds the default
template for Apache to use.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86071 13f79535-47bb-0310-9956-ffa450edef68
2000-08-14 04:32:00 +00:00
Jeff Trawick
2714bb67ca Get dsos working again by including $(LTFLAGS) on the command-line for
the --mode=link invocations of libtool/shlibtool.  The lack of LTFLAGS
resulted in no -export-dynamic, and dsos couldn't resolve symbols in
httpd.

LTFLAGS was lost in the 1.23 revision of rules.mk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85956 13f79535-47bb-0310-9956-ffa450edef68
2000-07-30 23:06:57 +00:00
Sascha Schumann
143b69bf3b 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85873 13f79535-47bb-0310-9956-ffa450edef68
2000-07-23 18:00:45 +00:00
Ryan Bloom
9b3868985e Make Apache use the new APR buildconf script to generate APR and MM
./configure.

With this change, APR can build without Apache again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85844 13f79535-47bb-0310-9956-ffa450edef68
2000-07-14 18:19:53 +00:00
Ryan Bloom
818d3941af Stop doing the find for make clean. This was causing us to clean every
directory twice.  We should still clean those directories that weren't
configured in the current configuration, but this wasn't the right
solution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85807 13f79535-47bb-0310-9956-ffa450edef68
2000-07-10 15:07:40 +00:00
Ryan Bloom
b18553794f Fix make distclean and make clean. Before this commit, we only cleaned
directories that have been configured by the last call to ./configure.
This means that if somebody does ./configure --with-mpm=dexter;make and
then ./configure --with-mpm=prefork;make and then make distclean, dexter
doesn't get cleaned up.  Same thing goes for clean.

All this does is with distclean and clean, after we have recursively
gone through the tree to clean everything, we do a quick find to get all
of the left-over Makefiles.  Then we just do the same operation on those
directories.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85773 13f79535-47bb-0310-9956-ffa450edef68
2000-07-06 00:09:48 +00:00
Greg Stein
85f6adff57 filter out the warning that AC_TRY_RUN gives us while running the
AC_C_BIGENDIAN macro. we've already handled the cross-compile case,
    so we don't need to see the message

Submitted by: idea from Sascha Schumann


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85746 13f79535-47bb-0310-9956-ffa450edef68
2000-07-02 00:16:27 +00:00
Ryan Bloom
766b60213d Finish the Configuration cleanup. This basically merges all of the
autoconf scripts that APR provides for other programs into apr_common.m4.
Other programs can then just include that file to get the APR checks that
are required.
Submitted by:	Sascha Schumann <sascha@schumann.cx>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85725 13f79535-47bb-0310-9956-ffa450edef68
2000-06-28 16:31:02 +00:00
Ryan Bloom
1381f07194 Use libtool to compile instead of cc. If we are going to use libtool,
we may as well go all the way.
Submitted by:	Hubert Feyrer <feyrer@rfhs8012.fh-regensburg.de>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85709 13f79535-47bb-0310-9956-ffa450edef68
2000-06-27 22:25:12 +00:00
William A. Rowe Jr
f8abdd9de4 Time to jump back into 2.0 again... here are yesterday's updates to
the MSVC conversion scripts, since the old ones would occasional be
  whacked.  Again I ask, if you see better code here, please commit it.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85601 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 20:44:46 +00:00
Jeff Trawick
21fda11151 Rebuild Apache and APR configure scripts when lib/apr/hints.m4 changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85582 13f79535-47bb-0310-9956-ffa450edef68
2000-06-15 17:54:37 +00:00
Ben Laurie
2cc83e1c79 Make dependencies work.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85517 13f79535-47bb-0310-9956-ffa450edef68
2000-06-11 15:40:18 +00:00
Ben Laurie
aec3139edd Eliminate spurious tab.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85513 13f79535-47bb-0310-9956-ffa450edef68
2000-06-11 13:17:37 +00:00
Sascha Schumann
3ef147f451 Avoid second invocation of cat.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85511 13f79535-47bb-0310-9956-ffa450edef68
2000-06-11 11:43:45 +00:00
William A. Rowe Jr
8fa23df7aa PR:
Obtained from:
Submitted by:
Reviewed by:

  Ick.  A message to make one's head spin in infinite recursion.  Fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85365 13f79535-47bb-0310-9956-ffa450edef68
2000-06-01 14:48:41 +00:00
William A. Rowe Jr
0d59289527 PR:
Obtained from:
Submitted by:
Reviewed by:

  Prevent the .dsp project files from being touched if they were
  already cleanly converted.  Note that just loading the 6.0 .dsp
  in the 5.0 MSVC environment doesn't toggle the /ZI->/Zi option.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85315 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 17:47:02 +00:00
William A. Rowe Jr
ad04fc9543 PR:
Obtained from:
Submitted by:
Reviewed by:

  Whoops... the two converters were to be non-destructive, and should be
  allowed to run multiple times in a row without harm.  This fixes a
  snafu that created multiple #PROP lines when invoked repeatedly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85300 13f79535-47bb-0310-9956-ffa450edef68
2000-05-26 04:51:07 +00:00
William A. Rowe Jr
867c2e8557 PR:
Obtained from:
Submitted by:
Reviewed by:

  Whoops, though I had already knocked off that nasty chomp() side effect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85299 13f79535-47bb-0310-9956-ffa450edef68
2000-05-26 04:22:14 +00:00
William A. Rowe Jr
605d3d9868 PR:
Obtained from:
Submitted by:
Reviewed by:

  Take advantage of Bill Stoddard's goof to change this over permanently.

  Conversion is rather one way, for consistency.  We can't really maintain
  a dsp version 5 file from version 6, since version 5 likes to split up
  !MESSAGE lines in odd places.  This should make things more consistent.

  Please execute cvstodsp5.pl from the helpers folder, prior to actually
  using the MSVC 5.0 environment.  When you are ready to diff, update or
  commit changes, use dsp5tocvs.pl from the helpers folder to convert
  them all back.  (Be careful that you have CLOSED the DevStudio workspace
  before you try either command!)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85298 13f79535-47bb-0310-9956-ffa450edef68
2000-05-26 04:18:27 +00:00
Ryan Bloom
2a648d2111 First function removed from Unix MPM's and moved to a common file. This
work is not anywhere near finished, but the cleanup has begun at least.
Had to make a couple of variables non-static, so a name change was required
since they are now viewable from outside the library.  The advantage to this
is code that is much easier to maintain into the future, because it is
duplicated less often.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85249 13f79535-47bb-0310-9956-ffa450edef68
2000-05-18 23:25:06 +00:00
Jeff Trawick
5ee0436af3 rebuild mm's configure if mm's aclocal.m4 has been modified
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85246 13f79535-47bb-0310-9956-ffa450edef68
2000-05-18 19:14:02 +00:00
Ryan Bloom
9039334724 We no longer have to -DHAVE_CONFIG_H on the $(CC) line, because the
ap_ac_config.h file has been renamed to ap_config.h which is included
directly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85211 13f79535-47bb-0310-9956-ffa450edef68
2000-05-12 23:56:19 +00:00
Jeff Trawick
8d281d3337 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)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85195 13f79535-47bb-0310-9956-ffa450edef68
2000-05-11 21:56:51 +00:00
Sascha Schumann
e034386cd8 Move the generating empty deps stuff into fastgen.sh. The .deps files
are only used by Makefiles which are created by fastgen.sh, so fastgen
is the natural place to create them.

The "portable dirname" regex has been changed to remove any number of
trailing slashes. Just in case. :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85139 13f79535-47bb-0310-9956-ffa450edef68
2000-05-04 20:17:22 +00:00
Brian Havard
b6d1cf01a2 The 'portable dirname' shouldn't leave a trailing / on the directory name
as it causes double trailing / in some places which confuses some programs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85128 13f79535-47bb-0310-9956-ffa450edef68
2000-05-03 02:42:18 +00:00
Sascha Schumann
6a0e55e698 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85113 13f79535-47bb-0310-9956-ffa450edef68
2000-04-30 18:27:18 +00:00
Sascha Schumann
6c2a300d10 Always create the target directory, if it does not exist. Also use the
Makefile template from the source tree.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85110 13f79535-47bb-0310-9956-ffa450edef68
2000-04-30 15:50:42 +00:00
Sascha Schumann
110f9d862d Get rid of last relative include path in our Makefiles
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85103 13f79535-47bb-0310-9956-ffa450edef68
2000-04-30 02:28:14 +00:00
Sascha Schumann
99fa11cb5f 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)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85102 13f79535-47bb-0310-9956-ffa450edef68
2000-04-30 00:06:07 +00:00
Sascha Schumann
0a3f836975 Get rid of NO_RECURSION. This was originally implemented for PHP and is not
used by Apache (will soon be obsolete in PHP as well).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85096 13f79535-47bb-0310-9956-ffa450edef68
2000-04-29 14:43:10 +00:00
Ryan Bloom
9e9da6ede9 Add back in the build before install step when using make install.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85079 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 15:32:50 +00:00
Brian Havard
fd9c9ad74d Remove unnecessary rules for .S files which clash with the rules for .s file
(which we probably also don't need) on case insensitive systems like OS/2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85073 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 06:15:53 +00:00
Ryan Bloom
65a47d0242 This stops Apache 2.0 from trying to compile the server when we run
make install.  We never used to build the server when installing in
the 1.3 tree, so I'm going back to that behavior.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85067 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 00:02:30 +00:00