anjuta r3963 - in branches/anjuta-2-4: . libegg plugins/language-manager

[jhs svn gnome org]

Author: jhs
Date: Tue May 27 11:05:56 2008
New Revision: 3963
URL: http://svn.gnome.org/viewvc/anjuta?rev=3963&view=rev

Log:
2008-05-27  Johannes Schmid  <jhs gnome org>

  Patch from  Frederic Crozat:
	* configure.in:
	* libegg/Makefile.am:
	* plugins/language-manager/Makefile.am:
	#535048 â Anjuta doesn\'t build when checking underlinking and overlinking

Modified:
   branches/anjuta-2-4/ChangeLog
   branches/anjuta-2-4/configure.in
   branches/anjuta-2-4/libegg/Makefile.am
   branches/anjuta-2-4/plugins/language-manager/Makefile.am

Modified: branches/anjuta-2-4/configure.in
==============================================================================
--- branches/anjuta-2-4/configure.in	(original)
+++ branches/anjuta-2-4/configure.in	Tue May 27 11:05:56 2008
@@ -187,6 +187,10 @@
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+PKG_CHECK_MODULES(X11, x11)
+AC_SUBST(X11_CFLAGS)
+AC_SUBST(X11_LIBS)
+
 PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED)
 AC_SUBST(GDK_PIXBUF_CFLAGS)
 AC_SUBST(GDK_PIXBUF_LIBS)

Modified: branches/anjuta-2-4/libegg/Makefile.am
==============================================================================
--- branches/anjuta-2-4/libegg/Makefile.am	(original)
+++ branches/anjuta-2-4/libegg/Makefile.am	Tue May 27 11:05:56 2008
@@ -8,6 +8,7 @@
 	$(GNOME_VFS_MODULE_CFLAGS) \
 	$(GNOME_UI_CFLAGS) \
 	$(GCONF_CFLAGS) \
+	$(X11_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	-DEGG_COMPILATION \
 	-DEGG_GLADEDIR=\"$(gladefiledir)\" \
@@ -56,6 +57,7 @@
 
 libanjuta_egg_la_LDFLAGS = $(ANJUTA_LDFLAGS)
 libanjuta_egg_la_LIBADD = \
+	$(X11_LIBS) \
 	$(GNOME_VFS_MODULE_LIBS) \
 	$(GNOME_UI_LIBS) \
 	$(GCONF_LIBS)

Modified: branches/anjuta-2-4/plugins/language-manager/Makefile.am
==============================================================================
--- branches/anjuta-2-4/plugins/language-manager/Makefile.am	(original)
+++ branches/anjuta-2-4/plugins/language-manager/Makefile.am	Tue May 27 11:05:56 2008
@@ -39,6 +39,9 @@
 liblanguage_manager_la_LIBADD = \
 	$(LIBANJUTA_LIBS) 
 
+liblanguage_manager_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
+
+
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(language_manager_plugin_DATA) \