wsanchez 99/07/07 18:18:33
Modified: src CHANGES
src/support apxs.8 apxs.pl
Log:
Add "-e" option which works like -i but doesn't install the DSO;
useful for editing httpd.conf with apxs.
Revision Changes Path
1.1394 +3 -1 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1393
retrieving revision 1.1394
diff -u -r1.1393 -r1.1394
--- CHANGES 1999/07/07 18:58:50 1.1393
+++ CHANGES 1999/07/08 01:18:28 1.1394
@@ -1,7 +1,9 @@
Changes with Apache 1.3.7
*) apxs: Add "-S var=val" option which allows for override of CFG_*
- built-in values. [Wilfredo Sanchez]
+ built-in values. Add "-e" option which works like -i but doesn't
+ install the DSO; useful for editing httpd.conf with apxs.
+ [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
1.8 +28 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apxs.8 1999/07/07 18:55:26 1.7
+++ apxs.8 1999/07/08 01:18:31 1.8
@@ -111,6 +111,22 @@
.B \-A
]
.IR dsofile " ..."
+
+.B apxs
+.B \-e
+[
+.BI \-S " name=value
+]
+[
+.BI \-n " modname"
+]
+[
+.B \-a
+]
+[
+.B \-A
+]
+.IR dsofile " ..."
.PP
.SH DESCRIPTION
.B apxs
@@ -306,7 +322,7 @@
as additional flags to the linker command.
Use this to add local linker-specific options.
.PP
-DSO installation options:
+DSO installation and configuration options:
.TP 12
.B \-i
This indicates the installation operation and installs one or more
@@ -331,6 +347,17 @@
directive is
prefixed with a hash sign (#), i.e. the module is
just prepared for later activation but initially disabled.
+.TP 12
+.B \-e
+This indicates the editing operation, which can be used with the
+.B \-a
+and
+.B \-A
+options similarly to the
+.B \-i
+operation to edit Apache's
+.B httpd.conf
+configuration file without attempting to install the module.
.PD
.SH EXAMPLES
Assume you have an Apache module named mod_foo.c available which should
extend
1.23 +10 -6 apache-1.3/src/support/apxs.pl
Index: apxs.pl
===================================================================
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apxs.pl 1999/07/07 18:55:26 1.22
+++ apxs.pl 1999/07/08 01:18:32 1.23
@@ -118,6 +118,7 @@
my @opt_l = ();
my @opt_W = ();
my @opt_S = ();
+my $opt_e = 0;
my $opt_i = 0;
my $opt_a = 0;
my $opt_A = 0;
@@ -195,15 +196,16 @@
print STDERR " [-I <incdir>] [-L <libdir>] [-l <libname>]
[-Wc,<flags>]\n";
print STDERR " [-Wl,<flags>] <files> ...\n";
print STDERR " apxs -i [-S <var>=<val>] [-a] [-A] [-n <modname>]
<dsofile> ...\n";
+ print STDERR " apxs -e [-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+S+iaA", @ARGV);
+($rc, @ARGV) = &Getopts("qn:gco:I+D+L+l+W+S+eiaA", @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);
+&usage if (not $opt_q and not ($opt_g and $opt_n) and not $opt_i and not
$opt_c and not $opt_e);
# argument handling
my @args = @ARGV;
@@ -396,12 +398,12 @@
&execute_cmds(@cmds);
# allow one-step compilation and installation
- if ($opt_i) {
+ if ($opt_i or $opt_e) {
@args = ( $dso_file );
}
}
-if ($opt_i) {
+if ($opt_i or $opt_e) {
##
## SHARED OBJECT INSTALLATION
##
@@ -419,8 +421,10 @@
}
my $t = $f;
$t =~ s|^.+/([^/]+)$|$1|;
- push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
+ if ($opt_i) {
+ push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+ push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
+ }
# determine module symbolname and filename
my $filename = '';
