anjuta r3561 - in trunk: . plugins/editor

[jhs svn gnome org]

Author: jhs
Date: Fri Feb  1 10:54:38 2008
New Revision: 3561
URL: http://svn.gnome.org/viewvc/anjuta?rev=3561&view=rev

Log:
2008-02-01  Johannes Schmid <jhs gnome org>

	* configure.in:
	* plugins/editor/Makefile.am:
	
	Fixed #512751 â libgnomeprint unnecessary without scintilla

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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Feb  1 10:54:38 2008
@@ -211,14 +211,6 @@
 AC_SUBST(GNOME_UI_CFLAGS)
 AC_SUBST(GNOME_UI_LIBS)
 
-PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.2 >= $GNOME_PRINT_REQUIRED)
-AC_SUBST(GNOME_PRINT_CFLAGS)
-AC_SUBST(GNOME_PRINT_LIBS)
-
-PKG_CHECK_MODULES(GNOME_PRINT_UI, libgnomeprintui-2.2 >= $GNOME_PRINT_UI_REQUIRED)
-AC_SUBST(GNOME_PRINT_UI_CFLAGS)
-AC_SUBST(GNOME_PRINT_UI_LIBS)
-
 PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED)
 AC_SUBST(GNOME_VFS_CFLAGS)
 AC_SUBST(GNOME_VFS_LIBS)
@@ -462,8 +454,13 @@
 	AC_MSG_RESULT(yes)
 	scintilla="no"
 else
-	AC_MSG_RESULT(no)
-	scintilla="yes"
+	PKG_CHECK_MODULES(PLUGIN_SCINTILLA,
+		[libgnomeprint-2.2 >= $GNOME_PRINT_REQUIRED,
+		 libgnomeprintui-2.2 >= $GNOME_PRINT_UI_REQUIRED],
+		[scintilla="yes"],
+		[scintilla="no"])
+	AC_SUBST(PLUGIN_SCINTILLA_CFLAGS)
+	AC_SUBST(PLUGIN_SCINTILLA_LIBS)
 fi
 AM_CONDITIONAL(HAVE_PLUGIN_SCINTILLA, [test x$scintilla = xyes])
 

Modified: trunk/plugins/editor/Makefile.am
==============================================================================
--- trunk/plugins/editor/Makefile.am	(original)
+++ trunk/plugins/editor/Makefile.am	Fri Feb  1 10:54:38 2008
@@ -26,6 +26,7 @@
 	$(GNOME_PRINT_UI_CFLAGS) \
 	$(GNOME_VFS_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
+	$(PLUGIN_SCINTILLA_CFLAGS) \
 	-I$(srcdir)/scintilla/include \
 	-I$(top_srcdir)/tagmanager/include
 
@@ -36,6 +37,7 @@
 	$(GNOME_PRINT_UI_LIBS) \
 	$(GNOME_VFS_LIBS) \
 	$(LIBANJUTA_LIBS) \
+	$(PLUGIN_SCINTILLA_LIBS) \
 	$(GLADE_LIBS) \
 	scintilla/libanjuta-scintilla.la \
 	$(top_builddir)/tagmanager/libanjuta-ctags.la