ghIntegration: introduce internal gnome-menus-2.30.2.

Includes our hacked <gnome-menus/gmenu-tree.h> in ghIntegrationX11.c, guarded
by REDIST_GMENU macro.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/services/plugins/unity/ghIntegration/ghIntegrationX11.c b/open-vm-tools/services/plugins/unity/ghIntegration/ghIntegrationX11.c
index 75ed2e2347eb4d65bbea1706c2d7b61221611b82..8e1fe42e6bfd428223aad1a84e3462fce8da7818 100644 (file)
--- a/open-vm-tools/services/plugins/unity/ghIntegration/ghIntegrationX11.c
+++ b/open-vm-tools/services/plugins/unity/ghIntegration/ghIntegrationX11.c
@@ -49,6 +49,12 @@
 #include <gdk/gdkx.h>
 #undef Bool
 
+/* And this is why we have to ship and link against our own. */
+#ifdef REDIST_GMENU
+#define GMENU_I_KNOW_THIS_IS_UNSTABLE
+#include <gnome-menus/gmenu-tree.h>
+#endif
+
 #include "vmware.h"
 #include "vmware/tools/guestrpc.h"
 #include "base64.h"