cvs commit: apache-1.3/src/support apxs.8 apxs.pl
wsanchez99/07/09 14:44:37
Modified:src CHANGES
src/support apxs.8 apxs.pl
Log:
Fix up apxs editing code so that multiple invocations of apxs -a will
not result in multiple LoadModule/AddModule entries for that module;
apxs can now be used to re- enable/disable modules that were installed
using apxs.
Revision ChangesPath
1.1395+4 -2 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1394
retrieving revision 1.1395
diff -u -r1.1394 -r1.1395
--- CHANGES 1999/07/08 01:18:28 1.1394
+++ CHANGES 1999/07/09 21:44:23 1.1395
@@ -2,8 +2,10 @@
*) apxs: Add -S var=val option which allows for override of CFG_*
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]
+ install the DSO; useful for editing httpd.conf with apxs. Fix
+ editing code so that multiple invocations of apxs -a will not
+ create duplicate LoadModule/AddModule entries; apxs can now be
+ used to re- enable/disable a module. [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.9 +3 -5 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apxs.81999/07/08 01:18:31 1.8
+++ apxs.81999/07/09 21:44:31 1.9
@@ -332,20 +332,18 @@
directory.
.TP 12
.B \-a
-This additionally activates the module
-by automatically adding a corresponding
+This activates the module by automatically adding a corresponding
.B LoadModule
line to Apache's
.B httpd.conf
-configuration file (only if no such entry exists yet).
+configuration file, or by enabling it if it already exists.
.TP 12
.B \-A
Same as option
.B \-a
but the created
.B LoadModule
-directive is
-prefixed with a hash sign (#), i.e. the module is
+directive is prefixed with a hash sign (#), i.e. the module is
just prepared for later activation but initially disabled.
.TP 12
.B \-e
1.24 +10 -11apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- apxs.pl 1999/07/08 01:18:32 1.23
+++ apxs.pl 1999/07/09 21:44:32 1.24
@@ -485,29 +485,28 @@
exit(1);
}
-my $update = 0;
my $lmd;
+my $c = '';
+$c = '#' if ($opt_A);
foreach $lmd (@lmd) {
+my $what = $opt_A ? preparing : activating;
if ($content !~ m|\n#?\s*$lmd|) {
- my $c = '';
- $c = '#' if ($opt_A);
$content =~
s|^(.*\n#?\s*LoadModule\s+[^\n]+\n)|$1$c$lmd\n|sg;
- $update = 1;
- $lmd =~ m|LoadModule\s+(.+?)_module.*|;
- my $what = $opt_A ? preparing : activating;
- print STDERR [$what module `$1' in
$CFG_SYSCONFDIR/$CFG_TARGET.conf]\n;
+} else {
+ $content =~ s|^(.*\n)#?\s*$lmd[^\n]*\n|$1$c$lmd\n|sg;
}
+$lmd =~ m|LoadModule\s+(.+?)_module.*|;
+print STDERR [$what module `$1' in
$CFG_SYSCONFDIR/$CFG_TARGET.conf]\n;
}
my $amd;
foreach $amd (@amd) {
if ($content !~ m|\n#?\s*$amd|) {
- my $c = '';
- $c = '#' if ($opt_A);
$content =~
s|^(.*\n#?\s*AddModule\s+[^\n]+\n)|$1$c$amd\n|sg;
- $update = 1;
+} else {
+ $content =~ s|^(.*\n)#?\s*$amd[^\n]*\n|$1$c$amd\n|sg;
}
}
-if ($update) {
+if (@lmd or @amd) {
open(FP, $CFG_SYSCONFDIR/$CFG_TARGET.conf.new) || die;
print FP $content;
close(FP);
cvs commit: apache-1.3/src/support apxs.8 apxs.pl
wsanchez99/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 ChangesPath
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.81999/07/07 18:55:26 1.7
+++ apxs.81999/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 STDERRapxs -i [-S var=val] [-a] [-A] [-n modname]
dsofile ...\n;
+print STDERRapxs -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 = '';
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/support apxs.8
martin 99/04/22 14:04:53 Modified:src/support apxs.8 Log: Fix a couple of typos Revision ChangesPath 1.6 +3 -3 apache-1.3/src/support/apxs.8 Index: apxs.8 === RCS file: /export/home/cvs/apache-1.3/src/support/apxs.8,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apxs.81999/01/01 19:05:33 1.5 +++ apxs.81999/04/22 21:04:53 1.6 @@ -292,9 +292,9 @@ DSO installation options: .TP 12 .B \-i -This indicates the installation operartion and installs one or more +This indicates the installation operation and installs one or more dynamically shared objects into the -servers +server's .I libexec directory. .TP 12 @@ -304,7 +304,7 @@ .B LoadModule line to Apache's .B httpd.conf -configuration file (only if still no such entry exists). +configuration file (only if no such entry exists yet). .TP 12 .B \-A Same as option
cvs commit: apache-1.3/src/support apxs.8
rse 98/12/18 02:53:22 Modified:src CHANGES src/support apxs.8 Log: Update APXS manual page: some -q option arguments were missing and another was incorrect. Submitted by: Mark Anderson [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 3553 Revision ChangesPath 1.1174+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1173 retrieving revision 1.1174 diff -u -r1.1173 -r1.1174 --- CHANGES 1998/12/17 15:09:27 1.1173 +++ CHANGES 1998/12/18 10:53:20 1.1174 @@ -1,5 +1,8 @@ Changes with Apache 1.3.4 + *) Update APXS manual page: some -q option arguments were missing + and another was incorrect. [Mark Anderson [EMAIL PROTECTED]] PR#3553 + *) Cleanup the command line options: `-?' was documented to show the usage list but does it with an error because `?' is not a valid command. OTOH a lot of users expect `-h' to print such a usage list and 1.4 +6 -5 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apxs.81998/12/02 09:52:18 1.3 +++ apxs.81998/12/18 10:53:21 1.4 @@ -205,11 +205,12 @@ .I query parameters can be one or more of the following strings: .nf - CC PREFIX - LD SBINDIR - CFLAGS INCLUDEDIR - CFLAGS_SHLIB LIBEXECDIR - LDFLAGS_SHLIB SYSCONFDIR + CC TARGET + CFLAGS SBINDIR + CFLAGS_SHLIBINCLUDEDIR + LD_SHLIBLIBEXECDIR + LDFLAGS_SHLIB SYSCONFDIR + LIBS_SHLIB .fi Use this for manually determining settings. For instance use .nf
cvs commit: apache-1.3/src/support apxs.8 apxs.pl
rse 98/12/02 01:52:19
Modified:src CHANGES
src/support apxs.8 apxs.pl
Log:
Allow special options -Wc,xxx and -Wl,xxx on APXS compile/link command. They
can occur multiple times and their arguments (`xxx') are passed AS IS to the
compiler/linker command. This functionality was originally requested by Rasmus
for PHP but is useful for other packages, too.
Revision ChangesPath
1.1157+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1156
retrieving revision 1.1157
diff -u -r1.1156 -r1.1157
--- CHANGES 1998/12/02 08:24:35 1.1156
+++ CHANGES 1998/12/02 09:52:16 1.1157
@@ -1,5 +1,9 @@
Changes with Apache 1.3.4
+ *) Allow special options -Wc,xxx and -Wl,xxx on APXS compile/link command.
+ They can occur multiple times and their arguments (`xxx') are passed AS
+ IS to the compiler/linker command. [Ralf S. Engelschall]
+
*) Fixed possible (but harmless in practice) bug in the DBM lookup
procedure of mod_rewrite: very long keys were truncated.
[Ralf S. Engelschall]
1.3 +18 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apxs.81998/04/03 13:29:08 1.2
+++ apxs.81998/12/02 09:52:18 1.3
@@ -79,6 +79,12 @@
[
.BI \-l libname
]
+[
+.BI \-Wc, compiler-flags
+]
+[
+.BI \-Wl, linker-flags
+]
.IR files ...
.B apxs
@@ -269,6 +275,18 @@
.BI \-l libname
This option is directly passed through to the linker command.
Use this to add your own libraries to search to the build process.
+.TP 12
+.BI \-Wc, compiler-flags
+This option passes
+.I compiler-flags
+as additional flags to the compiler command.
+Use this to add local compiler-specific options.
+.TP 12
+.BI \-Wl, linker-flags
+This option passes
+.I linker-flags
+as additional flags to the linker command.
+Use this to add local linker-specific options.
.PP
DSO installation options:
.TP 12
1.14 +12 -4 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apxs.pl 1998/12/02 00:00:19 1.13
+++ apxs.pl 1998/12/02 09:52:18 1.14
@@ -112,6 +112,7 @@
my @opt_I = ();
my @opt_L = ();
my @opt_l = ();
+my @opt_W = ();
my $opt_i = 0;
my $opt_a = 0;
my $opt_A = 0;
@@ -186,14 +187,15 @@
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] files ...\n;
+print STDERR[-L libdir] [-l libname] [-Wc,flags]
[-Wl,flags]\n;
+print STDERRfiles ...\n;
print STDERRapxs -i [-a] [-n modname] dsofile ...\n;
exit(1);
}
# option handling
my $rc;
-($rc, @ARGV) = Getopts(qn:gco:I+D+L+l+iaA, @ARGV);
+($rc, @ARGV) = Getopts(qn:gco:I+D+L+l+W+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);
@@ -324,7 +326,10 @@
# create compilation commands
my @cmds = ();
my $opt = '';
-my ($opt_I, $opt_D);
+my ($opt_Wc, $opt_I, $opt_D);
+foreach $opt_Wc (@opt_W) {
+$opt .= $1 if ($opt_Wc =~ m|^\s*c,(.*)$|);
+}
foreach $opt_I (@opt_I) {
$opt .= -I$opt_I ;
}
@@ -347,7 +352,10 @@
$cmd .= $o;
}
$opt = '';
-my ($opt_L, $opt_l);
+my ($opt_Wl, $opt_L, $opt_l);
+foreach $opt_Wl (@opt_W) {
+$opt .= $1 if ($opt_Wl =~ m|^\s*l,(.*)$|);
+}
foreach $opt_L (@opt_L) {
$opt .= -L$opt_L;
}
cvs commit: apache-1.3/src/support apxs.8 apxs.pl Makefile.tmpl
rse 98/03/31 07:46:17 Modified:.STATUS configure Makefile.tmpl src CHANGES src/support Makefile.tmpl Added: src/support apxs.8 apxs.pl Log: The new APache eXtenSion (apxs) support tool which can be used for OFF-SOURCE extending Apache via the dynamic shared object (DSO) mechanism provided by mod_so. Revision ChangesPath 1.250 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- STATUS1998/03/31 12:52:01 1.249 +++ STATUS1998/03/31 15:46:08 1.250 @@ -131,6 +131,7 @@ * Ralf's add of the new Apache Autoconf-style Interface (APACI) * Rainer Scherg's fix for CONNECT proxy support: #1326, #1573, #1942 * Ken's reworking of the Apache LICENSE +* Ralf's APache eXtenSion for easy off-source extending Apache via DSO Available Patches: 1.4 +10 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configure 1998/03/31 12:52:02 1.3 +++ configure 1998/03/31 15:46:10 1.4 @@ -139,6 +139,7 @@ localstatedir='$prefix/var' localstatesubdir_run='run' localstatesubdir_logs='logs' +includedir='$prefix/include' # check and debug layout=0 @@ -273,6 +274,7 @@ echo --sysconfdir=DIR install configuration files in DIR [PREFIX/etc] echo --datadir=DIR install read-only data files in DIR [PREFIX/share] echo --localstatedir=DIRinstall modifiable data files in DIR [PREFIX/var] +echo --includedir=DIR install includes files in DIR [PREFIX/include] echo --compat install with old Apache 1.2 installation paths echo echo Configuration options: @@ -325,6 +327,9 @@ --localstatedir=*) localstatedir=$apc_optarg ;; +--includedir=*) +includedir=$apc_optarg +;; --compat) prefix='/usr/local/apache' exec_prefix='$prefix' @@ -337,6 +342,7 @@ localstatedir='$prefix' localstatesubdir_run='logs' localstatesubdir_logs='logs' +includedir='$prefix/include' ;; --add-module=*) file=$apc_optarg @@ -576,7 +582,8 @@ ## IFS=' ' for var in prefix exec_prefix bindir sbindir \ - libexecdir mandir sysconfdir datadir localstatedir; do + libexecdir mandir sysconfdir datadir \ + localstatedir includedir; do eval val=\$$var; val=`echo $val | sed -e 's:/*$::'` eval $var=\$val\ @@ -619,6 +626,7 @@ echosysconfdir: $sysconfdir echo datadir: $datadir echo localstatedir: $localstatedir +echoincludedir: $includedir echo echo Compilation paths: echoHTTPD_ROOT: $prefix @@ -660,6 +668,7 @@ -e [EMAIL PROTECTED]@%$localstatedir%g \ -e [EMAIL PROTECTED]@%$localstatesubdir_run%g \ -e [EMAIL PROTECTED]@%$localstatesubdir_logs%g \ +-e [EMAIL PROTECTED]@%$includedir%g \ -e [EMAIL PROTECTED]@%$suexec%g \ -e [EMAIL PROTECTED]@%$suexec_caller%g \ -e [EMAIL PROTECTED]@%$suexec_userdir%g 1.4 +21 -2 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1998/03/31 12:52:01 1.3 +++ Makefile.tmpl 1998/03/31 15:46:11 1.4 @@ -94,6 +94,7 @@ sysconfdir = @sysconfdir@ datadir = @datadir@ localstatedir = @localstatedir@ +includedir = @includedir@ libexecdir_relative = @libexecdir_relative@ localstatesubdir_run = @localstatesubdir_run@ @@ -157,6 +158,7 @@ install-programs \ install-support \ install-config \ + install-include \ install-docroot [EMAIL PROTECTED] -f .install.tmp [EMAIL PROTECTED] -f .install.conf @@ -189,6 +191,7 @@ @echo === [mktree: Creating Apache installation tree] $(MKDIR) $(bindir) $(MKDIR) $(sbindir) + $(MKDIR) $(libexecdir) $(MKDIR) $(mandir)/man1 $(MKDIR) $(mandir)/man8 $(MKDIR) $(sysconfdir) @@ -198,6 +201,7 @@ $(MKDIR)
