Minor changes

* bootstrap: Remove generation of m4/varnish_mib.m4
* src/varnish_mib.mib2c: Remove stray comment.

2 files changed, 0 insertions, 52 deletions

diff --git a/bootstrap b/bootstrap
index 25bc72e..a4a33d4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -13,65 +13,14 @@ foreach my $dir ('m4', 'build-aux') {
 }
 
 unless (-f 'ChangeLog') {
     open(my $fd, '>', 'ChangeLog');
     print $fd <<EOT
 This file is a placeholder.  It will be filled with actual data by the first
 run of make.
 EOT
 ;
     close $fd;
 }
 
-print "$0: generating m4/varnish_mib.m4\n";
-open(my $fd, '<', $mib2c_config);
-my $prog;
-while (<$fd>) {
-    if (defined($prog)) {
-	last if /^\@endperl\@/;
-	$prog .= $_;
-    } else {
-	if (/^\@startperl\@/) {
-	    $prog = "no strict \"vars\";\n";
-	}
-    }
-}
-
-my %vars;
-eval $prog;
-die $@ if $@;
-die "$mib2c_config does not declare translation table"
-    unless exists $vars{'varnish_translate_table'};
-
-open(my $fd, '>', 'm4/varnish_mib.m4');
-print $fd <<'EOT';
-AC_DEFUN([AC_CHECK_VSC_C_MAIN_MEMBERS],
-[save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $VARNISHAPI_CFLAGS"
-EOT
-;
-
-foreach my $member (sort
-		     map { $_->[1] }
-		      grep { $_->[0] eq 'MAIN' }
-		       values %{$vars{'varnish_translate_table'}}) {
-    print $fd <<EOT
-  AC_CHECK_MEMBERS([struct VSC_C_main.$member],,,
-[#include <stddef.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <limits.h>
-#include <vapi/vsc.h>
-#include <vapi/vsm.h>
-#include <vcli.h>])
-EOT
-;
-}
-print $fd <<'EOT'
-CFLAGS="$save_CFLAGS"
-])    
-EOT
-;    
-close $fd;
-
 print "$0: reconfiguring\n";
 exec('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
@@ -244,25 +244,24 @@ varnish_get_vsm_data()
 		}
 	}
 	return vd;
 }
 
 /* Variable handlers.
 
    An instance handler only hands us one request at a time, unwrapping
    any eventual GETNEXT requests.  
 */
 
 @foreach $i scalar@
-/* COMMX $i */
   @startperl@
     &{$vars{'varnish_translate'}}($vars{'i'});
   @endperl@
 @if $varnish_type ne 'NULL'@
 $varnish_if
 static int
 handle_$i(netsnmp_mib_handler *handler,
                           netsnmp_handler_registration *reginfo,
                           netsnmp_agent_request_info   *reqinfo,
                           netsnmp_request_info         *requests)
 {
   @if $i.settable@