/pidgin/main: ae630b0851a9: Fix building on openSUSE 12.2

[Tomasz Wasilczyk]

Changeset: ae630b0851a98e4f1a355b632457efa460e2bdba
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-09-30 21:38 +0200
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/ae630b0851a9

Description:

Fix building on openSUSE 12.2

diffstat:

 .hgignore          |  1 +
 pidgin/Makefile.am |  2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diffs (30 lines):

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -7,6 +7,7 @@ syntax: regexp
 .*/perl/common/[^/]+\.c$
 .*/perl/common/blib.*
 .*/perl/common/pm_to_blib$
+.*/perl/common/MYMETA\.(json|yml)
 .*~$
 .*\.a$
 .*\.bak$
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -168,6 +168,7 @@ pidgin_LDADD = \
 	$(LIBXML_LIBS) \
 	$(WEBKIT_LIBS) \
 	$(GTK_LIBS) \
+	$(X11_LIBS) \
 	$(top_builddir)/libpurple/libpurple.la
 
 if USE_INTERNAL_LIBGADU
@@ -188,6 +189,7 @@ AM_CPPFLAGS = \
 	$(GSTREAMER_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(X11_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GTKSPELL_CFLAGS) \
 	$(LIBXML_CFLAGS) \