cvs commit: apache-1.3/src/os/bs2000 Makefile.tmpl
martin 99/07/07 04:02:01 Modified:src/os/bs2000 Makefile.tmpl Log: made depend Revision ChangesPath 1.10 +45 -3 apache-1.3/src/os/bs2000/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.tmpl 1998/05/10 13:04:36 1.9 +++ Makefile.tmpl 1999/07/07 11:02:00 1.10 @@ -36,7 +36,49 @@ rm Makefile.new $(OBJS): Makefile -os.o:os.c os-inline.c -ebcdic.o: ebcdic.c + # DO NOT REMOVE -os.o:os.c +bs2login.o: bs2login.c +bs2login.o: $(INCDIR)/httpd.h +bs2login.o: $(INCDIR)/ap_config.h +bs2login.o: $(INCDIR)/ap_mmn.h +bs2login.o: $(INCDIR)/ap_config_auto.h +bs2login.o: os.h +bs2login.o: $(INCDIR)/ap_ctype.h +bs2login.o: $(INCDIR)/hsregex.h +bs2login.o: $(INCDIR)/alloc.h +bs2login.o: $(INCDIR)/buff.h +bs2login.o: $(INCDIR)/ap.h +bs2login.o: ebcdic.h +bs2login.o: $(INCDIR)/util_uri.h +bs2login.o: $(INCDIR)/http_config.h +bs2login.o: $(INCDIR)/http_log.h +ebcdic.o: ebcdic.c +ebcdic.o: $(INCDIR)/ap_config.h +ebcdic.o: $(INCDIR)/ap_mmn.h +ebcdic.o: $(INCDIR)/ap_config_auto.h +ebcdic.o: os.h +ebcdic.o: $(INCDIR)/ap_ctype.h +ebcdic.o: $(INCDIR)/hsregex.h +ebcdic.o: ebcdic.h +os-inline.o: os-inline.c +os-inline.o: $(INCDIR)/ap_config.h +os-inline.o: $(INCDIR)/ap_mmn.h +os-inline.o: $(INCDIR)/ap_config_auto.h +os-inline.o: os.h +os-inline.o: $(INCDIR)/ap_ctype.h +os-inline.o: $(INCDIR)/hsregex.h +os.o: os.c +os.o: $(INCDIR)/httpd.h +os.o: $(INCDIR)/ap_config.h +os.o: $(INCDIR)/ap_mmn.h +os.o: $(INCDIR)/ap_config_auto.h +os.o: os.h +os.o: $(INCDIR)/ap_ctype.h +os.o: $(INCDIR)/hsregex.h +os.o: $(INCDIR)/alloc.h +os.o: $(INCDIR)/buff.h +os.o: $(INCDIR)/ap.h +os.o: ebcdic.h +os.o: $(INCDIR)/util_uri.h +os.o: $(INCDIR)/http_core.h
cvs commit: apache-1.3 STATUS
coar99/07/07 04:05:16 Modified:.STATUS Log: Veto EAPI for 1.3.7 (too much confusion and controversy, esp. with the KEAPI alternative); defer it until the next release. Also note some platforms I can build. Revision ChangesPath 1.724 +8 -30 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.723 retrieving revision 1.724 diff -u -r1.723 -r1.724 --- STATUS1999/06/25 08:12:18 1.723 +++ STATUS1999/07/07 11:05:15 1.724 @@ -1,9 +1,11 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/25 08:12:18 $] + Last modified at [$Date: 1999/07/07 11:05:15 $] Release: 1.3.7-dev: current. Ken volunteers to be release manager. +Proposed dates: roll on Mon, 26 July 1999, test, and release +on Fri, 30 July 1999. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. 1.3.5: Not released. @@ -20,7 +22,7 @@ Platform Avail. Volunteer -- alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 yes Lars Eilebrecht + alpha-dec-osf4.0 yes Lars Eilebrecht, Ken Coar armv4l-whatever-linux2yes Rasmus Lerdorf hppa1.1-hp-hpux no Rob Hartill i386-slackware-linux(a.out) no Sameer Parekh @@ -34,9 +36,10 @@ i686-pc-freebsd3.1no Ralf S. Engelschall i586-unknown-linux2 yes Ralf S. Engelschall, Lars Eilebrecht i686-unknown-linux2 yes Lars Eilebrecht + i686-whatever-linux2 yes Ken Coar i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass i386-unknown-netBSD-1.2.1 N/A Lars Eilebrecht - i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht + i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie i386-sni-svr4 yes Martin Kraemer @@ -105,33 +108,8 @@ Status: Jim +1, Mark +1, Dean +1, BenH +1, Randy +1 (please choose name other than hook) Doug +1 on concept (untested), Lars +1 on concept, - Martin +1 (untested), - - Ken: -1 for pre-2.0 if it will: a) force a new release of - mod_perl or mod_php in order to maintain compatibility OR - b) require a version bump to 1.4.0 and a beta cycle -Ralf: It doesn't force a new release of any module (just a -recompilation), because it's a pure _ADDITION_ to the API and -doesn't make anything incompatible. The point b) I still do -not sunderstand, sorry. - -* H now we've to solve another problem for the EAPI -* idea: the existance of KEAPI. That's not my problem any -* longer. Others have to make decisions now. Additionally the -* group as a whole is far away from a point where it's clear -* what should be done in the future and also far away from -* the point where it's fun. -* -* So I finally withdraw my proposed addition of EAPI for -* 1.3.7/1.4.0 and for 2.0 I've still no strong opinion how it -* should be done. I'll try to stay out of all this and keep -* being happy to have EAPI myself and don't have to worry -* about all those useless politics and endless ping-pong -* decisions. -* -* IMHO the ASF should really quickly propose the -* revitalization of RST's old ENOTOWN symbolic errno value -* for use by its developers... -- RSE + Martin +1 (untested), Ken -1 for 1.3.7 (too controversial, + esp. w/KEAPI offered as well) * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598)
Re: cvs commit: apache-1.3 STATUS
Did anyone else test the IPv6 patch ? Preferably on non solaris / non freebsd ? Dw. On 7 Jul 1999 [EMAIL PROTECTED] wrote: coar99/07/07 04:05:16 Modified:.STATUS Log: Veto EAPI for 1.3.7 (too much confusion and controversy, esp. with the KEAPI alternative); defer it until the next release. Also note some platforms I can build. Revision ChangesPath 1.724 +8 -30 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.723 retrieving revision 1.724 diff -u -r1.723 -r1.724 --- STATUS 1999/06/25 08:12:18 1.723 +++ STATUS 1999/07/07 11:05:15 1.724 @@ -1,9 +1,11 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/25 08:12:18 $] + Last modified at [$Date: 1999/07/07 11:05:15 $] Release: 1.3.7-dev: current. Ken volunteers to be release manager. +Proposed dates: roll on Mon, 26 July 1999, test, and release +on Fri, 30 July 1999. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. 1.3.5: Not released. @@ -20,7 +22,7 @@ Platform Avail. Volunteer -- alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 yes Lars Eilebrecht + alpha-dec-osf4.0 yes Lars Eilebrecht, Ken Coar armv4l-whatever-linux2yes Rasmus Lerdorf hppa1.1-hp-hpux no Rob Hartill i386-slackware-linux(a.out) no Sameer Parekh @@ -34,9 +36,10 @@ i686-pc-freebsd3.1no Ralf S. Engelschall i586-unknown-linux2 yes Ralf S. Engelschall, Lars Eilebrecht i686-unknown-linux2 yes Lars Eilebrecht + i686-whatever-linux2 yes Ken Coar i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass i386-unknown-netBSD-1.2.1 N/A Lars Eilebrecht - i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht + i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie i386-sni-svr4 yes Martin Kraemer @@ -105,33 +108,8 @@ Status: Jim +1, Mark +1, Dean +1, BenH +1, Randy +1 (please choose name other than hook) Doug +1 on concept (untested), Lars +1 on concept, - Martin +1 (untested), - - Ken: -1 for pre-2.0 if it will: a) force a new release of - mod_perl or mod_php in order to maintain compatibility OR - b) require a version bump to 1.4.0 and a beta cycle -Ralf: It doesn't force a new release of any module (just a -recompilation), because it's a pure _ADDITION_ to the API and -doesn't make anything incompatible. The point b) I still do -not sunderstand, sorry. - -* H now we've to solve another problem for the EAPI -* idea: the existance of KEAPI. That's not my problem any -* longer. Others have to make decisions now. Additionally the -* group as a whole is far away from a point where it's clear -* what should be done in the future and also far away from -* the point where it's fun. -* -* So I finally withdraw my proposed addition of EAPI for -* 1.3.7/1.4.0 and for 2.0 I've still no strong opinion how it -* should be done. I'll try to stay out of all this and keep -* being happy to have EAPI myself and don't have to worry -* about all those useless politics and endless ping-pong -* decisions. -* -* IMHO the ASF should really quickly propose the -* revitalization of RST's old ENOTOWN symbolic errno value -* for use by its developers... -- RSE + Martin +1 (untested), Ken -1 for 1.3.7 (too controversial, + esp. w/KEAPI offered as well) * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598)
cvs commit: apache-2.0/mpm 00README_FIRST_REALLY
martin 99/07/07 08:06:22 Modified:mpm 00README_FIRST_REALLY Log: Excellent, Ralf, good explanation. I fixed the quotes Revision ChangesPath 1.3 +8 -8 apache-2.0/mpm/00README_FIRST_REALLY Index: 00README_FIRST_REALLY === RCS file: /home/cvs/apache-2.0/mpm/00README_FIRST_REALLY,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 00README_FIRST_REALLY 1999/07/04 09:15:45 1.2 +++ 00README_FIRST_REALLY 1999/07/07 15:06:20 1.3 @@ -9,19 +9,19 @@ $ MPM_METHOD=prefork \ ./configure \ - --enable-rule=MPM - --disable-module=status - --disable-module=include - --disable-module=cgi + --enable-rule=MPM + --disable-module=status + --disable-module=include + --disable-module=cgi and for the MPM pthreading stuff via: $ MPM_METHOD=mpmt_pthread \ ./configure \ - --enable-rule=MPM - --disable-module=status - --disable-module=include - --disable-module=cgi + --enable-rule=MPM + --disable-module=status + --disable-module=include + --disable-module=cgi (on some systems you also need ``CFLAGS=-pthread LDFLAGS=-pthread'' !!)
cvs commit: apache-2.0/mpm/src/modules/mpm/mpmt_pthread acceptlock.c
martin 99/07/07 08:09:59 Modified:mpm/src/modules/mpm/mpmt_pthread acceptlock.c Log: unixd is required, the unixd_config is referenced Revision ChangesPath 1.3 +1 -0 apache-2.0/mpm/src/modules/mpm/mpmt_pthread/acceptlock.c Index: acceptlock.c === RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/mpmt_pthread/acceptlock.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- acceptlock.c 1999/06/27 03:45:15 1.2 +++ acceptlock.c 1999/07/07 15:09:58 1.3 @@ -67,6 +67,7 @@ #include util_script.h /* to force util_script.c linking */ #include util_uri.h #include acceptlock.h +#include unixd.h #include http_accept.h #include netinet/tcp.h #include stdio.h
cvs commit: apache-2.0/mpm/src/modules/mpm/mpmt_pthread Makefile.tmpl
martin 99/07/07 08:11:06 Modified:mpm/src/modules/mpm/mpmt_pthread Makefile.tmpl Log: Remove explicit dependency on /usr/include/pthread.h -- could as well be installed somewhere else. Revision ChangesPath 1.3 +4 -4 apache-2.0/mpm/src/modules/mpm/mpmt_pthread/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/mpmt_pthread/Makefile.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.tmpl 1999/06/27 03:45:15 1.2 +++ Makefile.tmpl 1999/07/07 15:11:05 1.3 @@ -67,7 +67,7 @@ $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \ $(INCDIR)/http_conf_globals.h $(INCDIR)/http_core.h \ $(INCDIR)/http_vhost.h $(INCDIR)/util_script.h \ - acceptlock.h $(INCDIR)/http_accept.h /usr/include/pthread.h + acceptlock.h $(INCDIR)/http_accept.h http_accept.o: http_accept.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ @@ -77,7 +77,7 @@ $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \ $(INCDIR)/http_main.h $(INCDIR)/http_conf_globals.h \ - acceptlock.h $(INCDIR)/scoreboard.h /usr/include/pthread.h \ + acceptlock.h $(INCDIR)/scoreboard.h \ $(INCDIR)/http_config.h $(INCDIR)/ap_listen.h \ $(INCDIR)/http_accept.h mpmt_pthread.h mpmt_pthread.o: mpmt_pthread.c $(INCDIR)/httpd.h \ @@ -92,7 +92,7 @@ $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \ $(INCDIR)/ap_mpm.h $(OSDIR)/unixd.h \ $(OSDIR)/iol_socket.h $(INCDIR)/ap_listen.h \ - $(INCDIR)/scoreboard.h /usr/include/pthread.h acceptlock.h \ + $(INCDIR)/scoreboard.h acceptlock.h \ $(INCDIR)/http_accept.h scoreboard.o: scoreboard.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ @@ -105,4 +105,4 @@ $(INCDIR)/http_main.h $(INCDIR)/http_core.h \ $(INCDIR)/http_config.h $(OSDIR)/unixd.h \ $(INCDIR)/http_conf_globals.h mpmt_pthread.h \ - $(INCDIR)/scoreboard.h /usr/include/pthread.h + $(INCDIR)/scoreboard.h
cvs commit: apache-2.0/mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c
martin 99/07/07 08:16:44 Modified:mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c Log: Update to new module layout (Hooks) Revision ChangesPath 1.4 +1 -2 apache-2.0/mpm/src/modules/mpm/mpmt_pthread/mpmt_pthread.c Index: mpmt_pthread.c === RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mpmt_pthread.c1999/07/02 18:22:26 1.3 +++ mpmt_pthread.c1999/07/07 15:16:43 1.4 @@ -1665,8 +1665,7 @@ NULL,/* type_checker */ NULL,/* pre-run fixups */ NULL,/* logger */ -NULL,/* header parser */ -NULL /* post_read_request */ +NULL /* register hooks */ }; /* force Expat to be linked into the server executable */
cvs commit: apache-2.0/mpm/src/modules/standard mod_actions.c
martin 99/07/07 08:19:16 Modified:mpm/src/modules/standard mod_actions.c Log: Update to new module layout (Hooks) Revision ChangesPath 1.3 +1 -2 apache-2.0/mpm/src/modules/standard/mod_actions.c Index: mod_actions.c === RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_actions.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_actions.c 1999/06/19 18:10:04 1.2 +++ mod_actions.c 1999/07/07 15:19:14 1.3 @@ -229,6 +229,5 @@ NULL,/* type_checker */ NULL,/* fixups */ NULL,/* logger */ -NULL,/* header parser */ -NULL /* post read-request */ +NULL /* register hooks */ };
cvs commit: apache-2.0/mpm/src/main http_connection.c http_log.c http_protocol.c http_request.c
martin 99/07/07 08:32:00
Modified:mpm/src/main http_connection.c http_log.c http_protocol.c
http_request.c
Log:
Sorry, but using C comments in place of C++ comments
makes life for me and my compiler much easier.
Revision ChangesPath
1.9 +3 -3 apache-2.0/mpm/src/main/http_connection.c
Index: http_connection.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_connection.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_connection.c 1999/07/06 21:32:10 1.8
+++ http_connection.c 1999/07/07 15:31:58 1.9
@@ -100,14 +100,14 @@
#ifdef USE_SO_LINGER
#define NO_LINGCLOSE /* The two lingering options are exclusive */
-static void sock_enable_linger(int s) // Z abstract the socket, s
+static void sock_enable_linger(int s) /* // Z abstract the socket, s */
{
-struct linger li; // Z SocketOptions...
+struct linger li; /* // Z SocketOptions... */
li.l_onoff = 1;
li.l_linger = MAX_SECS_TO_LINGER;
-if (setsockopt(s, SOL_SOCKET, SO_LINGER, // Z abstract, return
SUCCESS or not
+if (setsockopt(s, SOL_SOCKET, SO_LINGER, /* // Z abstract, return
SUCCESS or not */
(char *) li, sizeof(struct linger)) 0) {
ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf,
setsockopt: (SO_LINGER));
1.2 +1 -1 apache-2.0/mpm/src/main/http_log.c
Index: http_log.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_log.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- http_log.c1999/06/18 18:39:30 1.1
+++ http_log.c1999/07/07 15:31:58 1.2
@@ -409,7 +409,7 @@
FORMAT_MESSAGE_FROM_SYSTEM,
NULL,
nErrorCode,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* // Default language */
(LPTSTR) errstr + len,
sizeof(errstr) - len,
NULL
1.9 +3 -3 apache-2.0/mpm/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_protocol.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_protocol.c 1999/07/06 21:32:10 1.8
+++ http_protocol.c 1999/07/07 15:31:58 1.9
@@ -800,11 +800,11 @@
* have to block during a read.
*/
/* TODO: re-implement SAFEREAD external to BUFF using a layer */
-//ap_bsetflag(conn-client, B_SAFEREAD, 1);
+/* //ap_bsetflag(conn-client, B_SAFEREAD, 1); */
ap_bflush(conn-client);
while ((len = getline(l, sizeof(l), conn-client, 0)) = 0) {
if ((len 0) || ap_bgetflag(conn-client, B_EOF)) {
-//ap_bsetflag(conn-client, B_SAFEREAD, 0);
+ /* //ap_bsetflag(conn-client, B_SAFEREAD, 0); */
/* this is a hack to make sure that request time is set,
* it's not perfect, but it's better than nothing
*/
@@ -825,7 +825,7 @@
#endif
*/
-//ap_bsetflag(conn-client, B_SAFEREAD, 0);
+/* //ap_bsetflag(conn-client, B_SAFEREAD, 0); */
r-request_time = time(NULL);
r-the_request = ap_pstrdup(r-pool, l);
1.7 +1 -1 apache-2.0/mpm/src/main/http_request.c
Index: http_request.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_request.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- http_request.c1999/07/06 21:32:11 1.6
+++ http_request.c1999/07/07 15:31:59 1.7
@@ -1243,7 +1243,7 @@
* it's the application that's stalled.
*/
/* TODO: re-implement ap_bhalfduplex... not sure how yet */
-//ap_bhalfduplex(r-connection-client);
+/* //ap_bhalfduplex(r-connection-client); */
ap_log_transaction(r);
}
cvs commit: apache-1.3/src/support apxs.8 apxs.pl
wsanchez99/07/07 11:55:28
Modified:src/support apxs.8 apxs.pl
Log:
Add -S var=val option which allows for override of CFG_* built-in values.
Revision ChangesPath
1.7 +17 -0 apache-1.3/src/support/apxs.8
Index: apxs.8
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.8,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apxs.81999/04/22 21:04:53 1.6
+++ apxs.81999/07/07 18:55:26 1.7
@@ -56,15 +56,24 @@
.SH SYNOPSIS
.B apxs
.B \-g
+[
+.BI \-S name=value
+]
.BI \-n modname
.B apxs
.B \-q
+[
+.BI \-S name=value
+]
.IR query ...
.B apxs
.B \-c
[
+.BI \-S name=value
+]
+[
.BI \-o dsofile
]
[
@@ -90,6 +99,9 @@
.B apxs
.B \-i
[
+.BI \-S name=value
+]
+[
.BI \-n modname
]
[
@@ -218,6 +230,11 @@
.fi
inside your own Makefiles if you need manual access
to Apache's C header files.
+.PP
+Configuration options:
+.TP 12
+.BI \-S name=value
+This option changes the apxs settings described above.
.PP
Template Generation options:
.TP 12
1.22 +40 -18apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apxs.pl 1999/06/25 21:24:36 1.21
+++ apxs.pl 1999/07/07 18:55:26 1.22
@@ -68,18 +68,18 @@
## Configuration
##
-my $CFG_TARGET= '@TARGET@';# substituted via Makefile.tmpl
-my $CFG_CC= '@CC@';# substituted via Makefile.tmpl
-my $CFG_CFLAGS= '@CFLAGS@';# substituted via Makefile.tmpl
-my $CFG_CFLAGS_SHLIB = '@CFLAGS_SHLIB@'; # substituted via Makefile.tmpl
-my $CFG_LD_SHLIB = '@LD_SHLIB@'; # substituted via Makefile.tmpl
+my $CFG_TARGET= '@TARGET@';# substituted via
Makefile.tmpl
+my $CFG_CC= '@CC@';# substituted via
Makefile.tmpl
+my $CFG_CFLAGS= '@CFLAGS@';# substituted via
Makefile.tmpl
+my $CFG_CFLAGS_SHLIB = '@CFLAGS_SHLIB@'; # substituted via
Makefile.tmpl
+my $CFG_LD_SHLIB = '@LD_SHLIB@'; # substituted via
Makefile.tmpl
my $CFG_LDFLAGS_SHLIB = '@LDFLAGS_MOD_SHLIB@'; # substituted via
Makefile.tmpl
-my $CFG_LIBS_SHLIB= '@LIBS_SHLIB@';# substituted via Makefile.tmpl
-my $CFG_PREFIX= '@prefix@';# substituted via APACI install
-my $CFG_SBINDIR = '@sbindir@'; # substituted via APACI install
-my $CFG_INCLUDEDIR= '@includedir@';# substituted via APACI install
-my $CFG_LIBEXECDIR= '@libexecdir@';# substituted via APACI install
-my $CFG_SYSCONFDIR= '@sysconfdir@';# substituted via APACI install
+my $CFG_LIBS_SHLIB= '@LIBS_SHLIB@';# substituted via
Makefile.tmpl
+my $CFG_PREFIX= '@prefix@';# substituted via APACI
install
+my $CFG_SBINDIR = '@sbindir@'; # substituted via APACI
install
+my $CFG_INCLUDEDIR= '@includedir@';# substituted via APACI
install
+my $CFG_LIBEXECDIR= '@libexecdir@';# substituted via APACI
install
+my $CFG_SYSCONFDIR= '@sysconfdir@';# substituted via APACI
install
##
## Cleanup the above stuff
@@ -117,6 +117,7 @@
my @opt_L = ();
my @opt_l = ();
my @opt_W = ();
+my @opt_S = ();
my $opt_i = 0;
my $opt_a = 0;
my $opt_A = 0;
@@ -188,18 +189,18 @@
}
sub usage {
-print STDERR Usage: apxs -g -n modname\n;
-print STDERRapxs -q query ...\n;
-print STDERRapxs -c [-o dsofile] [-D name[=value]] [-I
incdir]\n;
-print STDERR[-L libdir] [-l libname] [-Wc,flags]
[-Wl,flags]\n;
-print STDERRfiles ...\n;
-print STDERRapxs -i [-a] [-A] [-n modname] dsofile ...\n;
+print STDERR Usage: apxs -g [-S var=val] -n modname\n;
+print STDERRapxs -q [-S var=val] query ...\n;
+print STDERRapxs -c [-S var=val] [-o dsofile] [-D
name[=value]]\n;
+print STDERR[-I incdir] [-L libdir] [-l libname]
[-Wc,flags]\n;
+print STDERR[-Wl,flags] files ...\n;
+print STDERRapxs -i [-S var=val] [-a] [-A] [-n modname]
dsofile ...\n;
exit(1);
}
# option handling
my $rc;
-($rc, @ARGV) = Getopts(qn:gco:I+D+L+l+W+iaA, @ARGV);
+($rc, @ARGV) = Getopts(qn:gco:I+D+L+l+W+S+iaA, @ARGV);
usage if ($rc == 0);
usage if ($#ARGV == -1 and not $opt_g);
usage if (not $opt_q and not ($opt_g and $opt_n) and not $opt_i and not
$opt_c);
@@ -208,6 +209,27 @@
my @args = @ARGV;
my $name = 'unknown';
$name = $opt_n if
cvs commit: apache-1.3/src CHANGES
wsanchez99/07/07 11:58:52 Modified:src CHANGES Log: apxs: Add -S var=val option which allows for override of CFG_* built-in values. Revision ChangesPath 1.1393+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1392 retrieving revision 1.1393 diff -u -r1.1392 -r1.1393 --- CHANGES 1999/06/30 09:21:57 1.1392 +++ CHANGES 1999/07/07 18:58:50 1.1393 @@ -1,4 +1,8 @@ Changes with Apache 1.3.7 + + *) apxs: Add -S var=val option which allows for override of CFG_* + built-in values. [Wilfredo Sanchez] + *) Win32: Update the server to use Winsock 2. Specifically, link with ws2_32.lib rather than wsock32.lib. This gives us access to WSADuplcateSocket() in addition to some other enhanced comm APIs.
