summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@nxc.no>2018-02-01 21:18:58 (GMT)
committer Sergey Poznyakoff <gray@nxc.no>2018-02-01 21:18:58 (GMT)
commit83919b99e222077a1bb61757403779cc4f456edc (patch) (unidiff)
treec2ffe0d33dae1f0051797fe5bbc9b10ef8f617b0
parent8bba300e4118da5737b2f015028a9ca425e83628 (diff)
downloadvarnish-mib-83919b99e222077a1bb61757403779cc4f456edc.tar.gz
varnish-mib-83919b99e222077a1bb61757403779cc4f456edc.tar.bz2
Minor changes
* bootstrap: Remove generation of m4/varnish_mib.m4 * src/varnish_mib.mib2c: Remove stray comment.
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xbootstrap51
-rw-r--r--src/varnish_mib.mib2c1
2 files changed, 0 insertions, 52 deletions
diff --git a/bootstrap b/bootstrap
index 25bc72e..a4a33d4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -22,56 +22,5 @@ EOT
22 close $fd; 22 close $fd;
23} 23}
24 24
25print "$0: generating m4/varnish_mib.m4\n";
26open(my $fd, '<', $mib2c_config);
27my $prog;
28while (<$fd>) {
29 if (defined($prog)) {
30 last if /^\@endperl\@/;
31 $prog .= $_;
32 } else {
33 if (/^\@startperl\@/) {
34 $prog = "no strict \"vars\";\n";
35 }
36 }
37}
38
39my %vars;
40eval $prog;
41die $@ if $@;
42die "$mib2c_config does not declare translation table"
43 unless exists $vars{'varnish_translate_table'};
44
45open(my $fd, '>', 'm4/varnish_mib.m4');
46print $fd <<'EOT';
47AC_DEFUN([AC_CHECK_VSC_C_MAIN_MEMBERS],
48[save_CFLAGS="$CFLAGS"
49CFLAGS="$CFLAGS $VARNISHAPI_CFLAGS"
50EOT
51;
52
53foreach my $member (sort
54 map { $_->[1] }
55 grep { $_->[0] eq 'MAIN' }
56 values %{$vars{'varnish_translate_table'}}) {
57 print $fd <<EOT
58 AC_CHECK_MEMBERS([struct VSC_C_main.$member],,,
59[#include <stddef.h>
60#include <stdlib.h>
61#include <stdint.h>
62#include <limits.h>
63#include <vapi/vsc.h>
64#include <vapi/vsm.h>
65#include <vcli.h>])
66EOT
67;
68}
69print $fd <<'EOT'
70CFLAGS="$save_CFLAGS"
71])
72EOT
73;
74close $fd;
75
76print "$0: reconfiguring\n"; 25print "$0: reconfiguring\n";
77exec('autoreconf -f -i -s'); 26exec('autoreconf -f -i -s');
diff --git a/src/varnish_mib.mib2c b/src/varnish_mib.mib2c
index 155df42..6915689 100644
--- a/src/varnish_mib.mib2c
+++ b/src/varnish_mib.mib2c
@@ -253,7 +253,6 @@ varnish_get_vsm_data()
253*/ 253*/
254 254
255@foreach $i scalar@ 255@foreach $i scalar@
256/* COMMX $i */
257 @startperl@ 256 @startperl@
258 &{$vars{'varnish_translate'}}($vars{'i'}); 257 &{$vars{'varnish_translate'}}($vars{'i'});
259 @endperl@ 258 @endperl@

Return to:

Send suggestions and report system problems to the System administrator.