Don't assume we have Lua just because we have plugin support.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 2 Dec 2013 09:10:13 +0000 (09:10 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 2 Dec 2013 09:10:13 +0000 (09:10 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53714 f5534014-38df-0310-8fa8-9805f1628bb7

tshark.c

index 73d0ed83097be791e4c178f3218aa8cb94cbfcdf..7dce609a4f286033737d69712e4529f41a1574a2 100644 (file)
--- 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)