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

[Jonny Lamb]

The following commit has been merged in the debian-patches branch:
commit 11952aa83ccd2e446166a39f41ae18e42a60afb9
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 079de7e..25c0169 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,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/src/Makefile.am b/src/Makefile.am
index a861afa..f131a62 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,12 +15,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.