anjuta r4329 - in trunk: . plugins/editor plugins/editor/scintilla

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Sat Oct 11 06:54:21 2008
New Revision: 4329
URL: http://svn.gnome.org/viewvc/anjuta?rev=4329&view=rev

Log:
	* configure.in,
	plugins/editor/scintilla/Makefile.am,
	plugins/editor/Makefile.am:
	Allow to compile scintilla after the last clean up


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/editor/Makefile.am
   trunk/plugins/editor/scintilla/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Oct 11 06:54:21 2008
@@ -160,7 +160,7 @@
 
 PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)
 
-PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $GNOME_REQUIRED libgnomeui-2.0 >= $GNOME_REQUIRED gnome-vfs-2.0 >= $GNOME_REQUIRED libgnomecanvas-2.0 >= $GNOME_REQUIRED gnome-vfs-module-2.0 >= $GNOME_REQUIRED)
+PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $GNOME_REQUIRED libgnomeui-2.0 >= $GNOME_REQUIRED gnome-vfs-2.0 >= $GNOME_REQUIRED libgnomecanvas-2.0 >= $GNOME_REQUIRED gnome-vfs-module-2.0 >= $GNOME_REQUIRED libgnomeprint-2.2 >= $GNOME_REQUIRED libgnomeprintui-2.2 >= $GNOME_REQUIRED)
 
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED)
 
@@ -366,12 +366,7 @@
 	scintilla="no"
 else
 	AC_MSG_RESULT(no)
-
-	PKG_CHECK_MODULES(PLUGIN_SCINTILLA,
-		[libgnomeprint-2.2 >= $GNOME_PRINT_REQUIRED,
-		 libgnomeprintui-2.2 >= $GNOME_PRINT_UI_REQUIRED],
-		[scintilla="yes"],
-		[scintilla="no"])
+	scintilla="yes"
 fi
 AM_CONDITIONAL(HAVE_PLUGIN_SCINTILLA, [test x$scintilla = xyes])
 
@@ -1122,7 +1117,6 @@
         echo "Building Scintilla based editor: .......................YES"
 else
         echo "Building Scintilla based editor: .......................NO"
-	echo "         Requires libgnomeprintui2.2-dev"
 fi
 
 if [ test x$symboldb = xyes ]; then

Modified: trunk/plugins/editor/Makefile.am
==============================================================================
--- trunk/plugins/editor/Makefile.am	(original)
+++ trunk/plugins/editor/Makefile.am	Sat Oct 11 06:54:21 2008
@@ -22,20 +22,20 @@
 plugin_LTLIBRARIES = libanjuta-editor.la
 
 AM_CPPFLAGS = \
-	$(GNOME_PRINT_UI_CFLAGS) \
 	$(GIO_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
-	$(PLUGIN_SCINTILLA_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(GNOME_CFLAGS) \
 	-I$(srcdir)/scintilla/include \
 	-I$(top_srcdir)/tagmanager/include
 
 libanjuta_editor_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_editor_la_LIBADD = \
-	$(GNOME_PRINT_UI_LIBS) \
 	$(GIO_LIBS) \
 	$(LIBANJUTA_LIBS) \
-	$(PLUGIN_SCINTILLA_LIBS) \
+	$(GTK_LIBS) \
+	$(GNOME_LIBS) \
 	$(GLADE_LIBS) \
 	scintilla/libanjuta-scintilla.la \
 	$(top_builddir)/tagmanager/libanjuta-ctags.la

Modified: trunk/plugins/editor/scintilla/Makefile.am
==============================================================================
--- trunk/plugins/editor/scintilla/Makefile.am	(original)
+++ trunk/plugins/editor/scintilla/Makefile.am	Sat Oct 11 06:54:21 2008
@@ -63,7 +63,7 @@
 	$(LEXER_SRCS)
 
 libanjuta_scintilla_la_LIBADD = \
-	$(GTHREAD_LIBS) \
+	$(GLIB_LIBS) \
 	$(GTK_LIBS)
 
 noinst_PROGRAMS = test-scintilla