[SCM] Debian packaging for libhildon. branch, debian-patches, updated. upstream/2.1.34.debian.1-6-gfe6d102

[Jonny Lamb]

The following commit has been merged in the debian-patches branch:
commit c54466c08b7d5b48ca161cd1c14b29efcf42d32e
Author: Jonny Lamb <jonny at debian.org>
Date:   Tue Jan 26 10:07:46 2010 +0000

    Be sure to link to Xlib.
    
    Signed-off-by: Jonny Lamb <jonny at debian.org>

diff --git a/configure.ac b/configure.ac
index 24fdfc1..8698249 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,10 @@ AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_VERSION)
 
+PKG_CHECK_MODULES(X, x11)
+AC_SUBST(X_LIBS)
+AC_SUBST(X_CFLAGS)
+
 # libcanberra is needed for the hildon-note sounds.
 
 PKG_CHECK_MODULES(CANBERRA, libcanberra)
diff --git a/hildon/Makefile.am b/hildon/Makefile.am
index 10f1c91..953f4f8 100644
--- a/hildon/Makefile.am
+++ b/hildon/Makefile.am
@@ -14,12 +14,14 @@ lib_LTLIBRARIES = libhildon- at API_VERSION_MAJOR@.la
 libhildon_ at API_VERSION_MAJOR@_la_LDFLAGS = $(HILDON_WIDGETS_LT_LDFLAGS)
 
 libhildon_ at API_VERSION_MAJOR@_la_LIBADD = \
+		$(X_LIBS)			\
 		$(GTK_LIBS) 			\
 	  	$(GCONF_LIBS) 			\
 	  	$(CANBERRA_LIBS)		\
 	  	@HILDON_LT_LDFLAGS@
 
 libhildon_ at API_VERSION_MAJOR@_la_CFLAGS	= \
+		$(X_CFLAGS)			\
 		$(GTK_CFLAGS) 			\
 		$(GCONF_CFLAGS) 		\
 		$(EXTRA_CFLAGS)			\

-- 
Debian packaging for libhildon.