Avoid to add an empty menu if there's no Lua.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19346 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/menu.c b/gtk/menu.c
index 3a821059062c4206b6700d7bc51395f7adf30791..144b21d8682addcb3b8d115aff89c9ad9f24cb7c 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -943,7 +943,9 @@ register_stat_menu_item(
     case(REGISTER_STAT_GROUP_TELEPHONY): toolspath = "/Statistics/"; break;
     case(REGISTER_STAT_GROUP_NONE): toolspath = "/Statistics/"; break;
     case(REGISTER_ANALYZE_GROUP_NONE): toolspath = "/Analyze/"; break;
+#ifdef HAVE_LUA_5_1
     case(REGISTER_TOOLS_GROUP_NONE): toolspath = "/Tools/"; break;
+#endif
     default:
         g_assert(0);
         toolspath = NULL;
@@ -1069,8 +1071,10 @@ static guint merge_tap_menus_layered(GList *node, gint group) {
                 break;
             case(REGISTER_ANALYZE_GROUP_NONE):
                 break;
+#ifdef HAVE_LUA_5_1
             case(REGISTER_TOOLS_GROUP_NONE):
                 break;
+#endif
             default:
                 g_assert_not_reached();
             }
@@ -1143,10 +1147,11 @@ void merge_all_tap_menus(GList *node) {
                entry->path = "/Analyze/";
         /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
     }
+#ifdef HAVE_LUA_5_1
     if (merge_tap_menus_layered(node, REGISTER_TOOLS_GROUP_NONE)) {
         /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
     }
-       
+#endif
 
 }
 

diff --git a/stat_menu.h b/stat_menu.h
index 1d9d0aab7963ce6beaf050328b04e26f34c8f79d..1dd56f9009e93e6dccc11a0d2fd35e3f1d2d575c 100644 (file)
--- a/stat_menu.h
+++ b/stat_menu.h
@@ -51,7 +51,9 @@ typedef enum {
     REGISTER_STAT_GROUP_TELEPHONY,
     /* XXX - split into telephony and VoIP? */
        REGISTER_ANALYZE_GROUP_NONE,
+#ifdef HAVE_LUA_5_1
        REGISTER_TOOLS_GROUP_NONE,
+#endif
 } register_stat_group_t;
 
 #ifdef __cplusplus