aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-12-02 09:10:13 +0000
committerGuy Harris <guy@alum.mit.edu>2013-12-02 09:10:13 +0000
commitc3de2cb2fe4e47b59c2af55226c380633fa9119c (patch)
tree2546895af4b900bcb3bbd52f1ca2d6f6a71eef35 /tshark.c
parent7c10c3d617347d81bce51ada7ac2b04bc4b6bb1c (diff)
Don't assume we have Lua just because we have plugin support.
svn path=/trunk/; revision=53714
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/tshark.c b/tshark.c
index 73d0ed8309..7dce609a4f 100644
--- a/tshark.c
+++ b/tshark.c
@@ -70,7 +70,9 @@
#include "globals.h"
#include <epan/timestamp.h>
#include <epan/packet.h>
+#ifdef HAVE_LUA
#include <epan/wslua/init_wslua.h>
+#endif
#include "file.h"
#include "frame_tvbuff.h"
#include <epan/disabled_protos.h>
@@ -1164,12 +1166,14 @@ main(int argc, char *argv[])
proto_registrar_dump_ftypes();
else if (strcmp(argv[2], "heuristic-decodes") == 0)
dissector_dump_heur_decodes();
-#ifdef HAVE_PLUGINS
else if (strcmp(argv[2], "plugins") == 0) {
+#ifdef HAVE_PLUGINS
plugins_dump_all();
+#endif
+#ifdef HAVE_LUA
wslua_plugins_dump_all();
- }
#endif
+ }
else if (strcmp(argv[2], "protocols") == 0)
proto_registrar_dump_protocols();
else if (strcmp(argv[2], "values") == 0)