Have editcap and capinfos compile --without-plugins

Should go in 0.99.6


svn path=/trunk/; revision=22116

1 files changed, 9 insertions, 7 deletions

diff --git a/editcap.c b/editcap.c
index 4a033d351a..ec3a898fde 100644
--- a/editcap.c
+++ b/editcap.c
@@ -380,17 +380,19 @@ int main(int argc, char *argv[])
   int split_packet_count = 0;
   int written_count = 0;
   char *filename;
+#ifdef HAVE_PLUGINS
   char* init_progfile_dir_error;
-  
+
   /* Register wiretap plugins */
-    if ((init_progfile_dir_error = init_progfile_dir(argv[0]))) {
-	g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
-	g_free(init_progfile_dir_error);
+  if ((init_progfile_dir_error = init_progfile_dir(argv[0]))) {
+	  g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
+	  g_free(init_progfile_dir_error);
     } else {
-	init_report_err(failure_message,NULL,NULL);
-	init_plugins();
-	register_all_wiretap_modules();
+		init_report_err(failure_message,NULL,NULL);
+		init_plugins();
+		register_all_wiretap_modules();
     }
+#endif
     
   /* Process the options */
   while ((opt = getopt(argc, argv, "A:B:c:C:dE:F:hrs:t:T:v")) !=-1) {