[anjuta-extras] Add libgnome as dependency



commit ff7207c379814e02b377dafe74f379efcaa66b20
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Wed Jun 24 21:48:26 2009 +0200

    Add libgnome as dependency
    
    Needed to remove libgnome from libanjuta dependency

 configure.ac                          |    4 ++++
 plugins/class-inheritance/Makefile.am |    2 ++
 plugins/profiler/Makefile.am          |    3 ++-
 plugins/scintilla/aneditor-priv.h     |    2 +-
 plugins/valgrind/plugin.c             |    2 --
 5 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 15690c7..2f16c7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,12 +20,14 @@ LIBGRAPHVIZ_REQUIRED=1.0
 GTK_REQUIRED=2.14.0
 GLIB_REQUIRED=2.16.0
 GCONF_REQUIRED=2.12.0
+GNOME_REQUIRED=2.12.0
 
 AC_SUBST(LIBGRAPHVIZ_REQUIRED)
 AC_SUBST(BINUTILS_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GCONF_REQUIRED)
+AC_SUBST(GNOME_REQUIRED)
 
 
 dnl ***************************************************************************
@@ -71,6 +73,8 @@ AM_MAINTAINER_MODE
 dnl Check for libanjuta
 PKG_CHECK_MODULES(LIBANJUTA, [libanjuta-1.0 >= 2.27.0])
 
+dnl Check for libgnome
+PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $GNOME_REQUIRED libgnomeui-2.0 >= $GNOME_REQUIRED libgnomecanvas-2.0 >= $GNOME_REQUIRED)
 
 dnl Valgrind plugin
 dnl check for libbfd
diff --git a/plugins/class-inheritance/Makefile.am b/plugins/class-inheritance/Makefile.am
index 507ba43..4bb7f0d 100644
--- a/plugins/class-inheritance/Makefile.am
+++ b/plugins/class-inheritance/Makefile.am
@@ -24,6 +24,7 @@ cls_inheritance_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
 # Include paths
 AM_CPPFLAGS = \
+	$(GNOME_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	$(EXTRA_CFLAGS) \
 	$(GRAPHVIZ_CFLAGS) \
@@ -39,6 +40,7 @@ libanjuta_class_inheritance_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
 libanjuta_class_inheritance_la_LIBADD = \
+	$(GNOME_LIBS) \
 	$(LIBANJUTA_LIBS) \
 	$(GRAPHVIZ_LIBS)
 
diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am
index a86f135..0b1cba3 100644
--- a/plugins/profiler/Makefile.am
+++ b/plugins/profiler/Makefile.am
@@ -33,6 +33,7 @@ profiler_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
 
 # Include paths
 AM_CPPFLAGS = \
+	$(GNOME_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	$(EXTRA_CFLAGS)
 
@@ -86,7 +87,7 @@ endif
 libanjuta_profiler_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
-libanjuta_profiler_la_LIBADD = $(LIBANJUTA_LIBS) $(GNOME_CANVAS_LIBS) $(GIO_LIBS) $(LIBXML_LIBS)
+libanjuta_profiler_la_LIBADD = $(LIBANJUTA_LIBS) $(GNOME_LIBS) $(GIO_LIBS) $(LIBXML_LIBS)
 
 if HAVE_GRAPHVIZ
 libanjuta_profiler_la_LIBADD += $(GRAPHVIZ_LIBS)
diff --git a/plugins/scintilla/aneditor-priv.h b/plugins/scintilla/aneditor-priv.h
index b1b82f0..8e24098 100644
--- a/plugins/scintilla/aneditor-priv.h
+++ b/plugins/scintilla/aneditor-priv.h
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <locale.h>
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #define GTK
 #include "Platform.h"
diff --git a/plugins/valgrind/plugin.c b/plugins/valgrind/plugin.c
index 17ca863..1538f27 100644
--- a/plugins/valgrind/plugin.c
+++ b/plugins/valgrind/plugin.c
@@ -23,8 +23,6 @@
 
 #include <config.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-about.h>
 #include <libanjuta/anjuta-shell.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/interfaces/ianjuta-document-manager.h>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]