[libgnomekbd] Add gio to the required pkg-config modules



commit 3b0c8935a0b01299655fb90b66850d560786d608
Author: Sjoerd Simons <sjoerd luon net>
Date:   Sun Nov 28 18:34:23 2010 +0000

    Add gio to the required pkg-config modules
    
    libgnomekbd uses GSettings, which is part of GIO. If GIO isn't added to the
    pkg-config modules and the LDFLAGS linking will fail when using -Wl,--as-needed

 configure.in            |    2 +-
 libgnomekbd/Makefile.am |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index 09985c3..f88ba40 100644
--- a/configure.in
+++ b/configure.in
@@ -53,7 +53,7 @@ IT_PROG_INTLTOOL([0.35.0])
 
 AC_CHECK_FUNCS(setlocale)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index 1f7933d..1afdf3a 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -26,11 +26,13 @@ libgnomekbd_la_CFLAGS = $(common_CFLAGS)
 
 libgnomekbdui_la_CFLAGS = $(common_CFLAGS)		\
 	-DUIDIR=\"$(uidir)\"				\
+	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS)
 
 common_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
 
 common_LIBADD = \
+		$(GLIB_LIBS) \
 		$(GDK_LIBS) \
 		$(LIBXKLAVIER_LIBS) \
 		$(XLIB_LIBS)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]