Commit Graph

69 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e31781864a fix path to mm's configure.in
fix aclocal.m4's dependencies
Submitted by:	Sascha Schumann <sascha@schumann.cx>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85056 13f79535-47bb-0310-9956-ffa450edef68
2000-04-27 11:30:35 +00:00
3bcafbf685 We should be checking for apr_private.h.in and updating it from now on.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85031 13f79535-47bb-0310-9956-ffa450edef68
2000-04-25 19:16:36 +00:00
9566b29699 Add error checking in case libtoolize is not in path.
PR:	10


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84936 13f79535-47bb-0310-9956-ffa450edef68
2000-04-07 18:41:09 +00:00
88479e5ce3 Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84876 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 07:02:32 +00:00
3f4be26106 Remove a trailing slash from library.mk. This slash was causing problems
on non-GNU make systems
PR:  20
Submitted by:	Mike Abbott <mja@sgi.com>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84870 13f79535-47bb-0310-9956-ffa450edef68
2000-03-30 23:39:58 +00:00
02ed62a19b Make dependency generation work on OS/2. The preprocessor outputs \\'s as
path separators so switch them to /'s


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84794 13f79535-47bb-0310-9956-ffa450edef68
2000-03-19 13:25:33 +00:00
b6591793b0 Tru64 make uses the wrong directory for includes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84793 13f79535-47bb-0310-9956-ffa450edef68
2000-03-18 14:06:33 +00:00
3393f4abf4 Remove tabs from blank lines
PR:	17
Submitted by:	mja@sgi.com


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84783 13f79535-47bb-0310-9956-ffa450edef68
2000-03-16 23:05:07 +00:00
ee839f0042 Minor nit: use top_srcdir instead of topsrcdir, to be more consistent
with autoconf.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84770 13f79535-47bb-0310-9956-ffa450edef68
2000-03-15 22:46:33 +00:00
a5b741fa27 even more distclean goodness (there's still more... time for zzz though)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84762 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 08:04:50 +00:00
de314fc3a2 it's more traditional in autoconf projects for "make distclean" to clean
up things such as the apaci script, rather than "make clean".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84759 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 07:45:08 +00:00
f7cd8be2a1 some messed up comments... just copied in the license again from main/http_main.c hope that was right
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84748 13f79535-47bb-0310-9956-ffa450edef68
2000-03-12 20:02:45 +00:00
b1c26f031a Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
2000-03-10 00:07:37 +00:00
6c08c11b2d Rebuild the configure for MM. Once this has settled we can remove the
configure script as it shouldn't really be there anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84716 13f79535-47bb-0310-9956-ffa450edef68
2000-03-04 15:49:16 +00:00
760f5c2226 "libtool" gets generated to the current directory and gets picked up by
PrintPath on subsequent buildconf's so look for libtoolize instead to find the
libtool source directory.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84707 13f79535-47bb-0310-9956-ffa450edef68
2000-03-03 14:41:00 +00:00
38333a2aca Allow scripts (that don't have a .exe extension) to be found by PrintPath
under OS/2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84706 13f79535-47bb-0310-9956-ffa450edef68
2000-03-03 14:30:09 +00:00
38f5358de7 Enable dynamic module support on Linux. This should work on any LIBTOOL
based system, but YMMV.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84639 13f79535-47bb-0310-9956-ffa450edef68
2000-02-17 22:32:30 +00:00
294e28e663 Fix the make clean rules. We must delete *.slo files or we are leaving stale
libraries in the modules/standard directory when configured for dynamic
modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84625 13f79535-47bb-0310-9956-ffa450edef68
2000-02-16 00:55:51 +00:00
85f80d7338 This changes build.mk to use the PrintPath utility in helpers to
try and keep as much portability as possible.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84590 13f79535-47bb-0310-9956-ffa450edef68
2000-02-07 17:16:57 +00:00
d8183c5574 remove one space...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84533 13f79535-47bb-0310-9956-ffa450edef68
2000-01-30 00:36:55 +00:00
f8a7fce423 Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is
defined correctly in all C files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84531 13f79535-47bb-0310-9956-ffa450edef68
2000-01-28 18:02:29 +00:00
afb25f19b3 Remove vestiges of automake.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84484 13f79535-47bb-0310-9956-ffa450edef68
2000-01-17 20:34:44 +00:00
ab6abdbd53 Move threads/reentrancy m4 macros into threads.m4. All results are now
cached and can be made easily available to Apache and APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84475 13f79535-47bb-0310-9956-ffa450edef68
2000-01-16 20:00:51 +00:00
fe938b5b70 Remove config.cache, if configure is rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84473 13f79535-47bb-0310-9956-ffa450edef68
2000-01-16 18:20:17 +00:00
312bc88029 Remove dependency on automake's aclocal. We continue to use acinclude.m4,
because aclocal.m4 needs to contain libtool's m4 macros.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84471 13f79535-47bb-0310-9956-ffa450edef68
2000-01-16 17:18:13 +00:00
b77478da7b We're building Apache, not PHP.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84462 13f79535-47bb-0310-9956-ffa450edef68
2000-01-15 15:37:52 +00:00
3b1447bd84 Fix OS/390 binbuild break
Submitted by:	Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84454 13f79535-47bb-0310-9956-ffa450edef68
2000-01-13 16:02:09 +00:00
a04b640f67 `-follow' is a GNU extension, remove it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84446 13f79535-47bb-0310-9956-ffa450edef68
2000-01-12 16:55:58 +00:00