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 Changes Path
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.8 1998/04/03 13:29:08 1.2
+++ apxs.8 1998/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 STDERR " apxs -q <query> ...\n";
print STDERR " apxs -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 STDERR " <files> ...\n";
print STDERR " apxs -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";
}
