[anjuta-extras] scintilla: bgo#590633 – Add libgthread-2.0 to link

[Sebastien Granjoux <sgranjoux src gnome org>]

commit c091bebd7c6806783f2facbd8fda234481dd8bff
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Aug 11 14:57:54 2009 +0200

    scintilla: bgo#590633 â?? Add libgthread-2.0 to link

 configure.ac                            |    3 +++
 plugins/scintilla/Makefile.am           |   10 ++--------
 plugins/scintilla/scintilla/Makefile.am |    8 +++-----
 3 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 77abb1d..3eaf936 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,9 @@ PKG_CHECK_MODULES(LIBANJUTA, [libanjuta-1.0 >= 2.27.0])
 dnl Check for libgnome
 PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOME_REQUIRED)
 
+dnl check for gthread
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GLIB_REQUIRED)
+
 dnl Valgrind plugin
 dnl check for libbfd
 dnl -------------------------------------------------------------
diff --git a/plugins/scintilla/Makefile.am b/plugins/scintilla/Makefile.am
index e8b3744..8ffea52 100644
--- a/plugins/scintilla/Makefile.am
+++ b/plugins/scintilla/Makefile.am
@@ -23,21 +23,15 @@ plugin_LTLIBRARIES = libanjuta-editor.la
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/scintilla/include \
-	$(GIO_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
-	$(GTK_CFLAGS) \
-	$(GLIB_CFLAGS) \
 	$(EXTRA_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libanjuta-scintilla\"
 
 libanjuta_editor_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_editor_la_LIBADD = \
-  $(GIO_LIBS) \
-	$(LIBANJUTA_LIBS) \
-	$(GTK_LIBS) \
-	$(GLIB_LIBS) \
-  scintilla/libanjuta-scintilla.la
+	$(LIBANJUTA_LIBS)\
+	scintilla/libanjuta-scintilla.la
 
 libanjuta_editor_la_SOURCES= \
 	properties.cxx \
diff --git a/plugins/scintilla/scintilla/Makefile.am b/plugins/scintilla/scintilla/Makefile.am
index ea53e2e..bc23d88 100644
--- a/plugins/scintilla/scintilla/Makefile.am
+++ b/plugins/scintilla/scintilla/Makefile.am
@@ -7,8 +7,7 @@ noinst_LTLIBRARIES = libanjuta-scintilla.la
 AM_CPPFLAGS = \
 	-I$(srcdir)/include \
 	$(LIBANJUTA_CFLAGS) \
-	$(GTK_CFLAGS) \
-	$(GLIB_CFLAGS) \
+	$(GTHREAD_CFLAGS) \
 	-DGTK -DSCI_LEXER -DUSE_XIM
 
 AM_CXXFLAGS = -DGTK -DSCI_LEXER -DUSE_XIM
@@ -75,9 +74,8 @@ libanjuta_scintilla_la_SOURCES =\
 	$(LEXER_SRCS)
 
 libanjuta_scintilla_la_LIBADD = \
-  $(LIBANJUTA_LIBS) \
-	$(GLIB_LIBS) \
-	$(GTK_LIBS)
+	$(LIBANJUTA_LIBS) \
+	$(GTHREAD_LIBS)
 
 noinst_PROGRAMS = test-scintilla