[gnome-disk-utility] Bug 600998 — We are using Xkb* functions, so make sure we link against libX11
- From: David Zeuthen <davidz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility] Bug 600998 — We are using Xkb* functions, so make sure we link against libX11
- Date: Fri, 4 Dec 2009 14:13:05 +0000 (UTC)
commit 46981e24ed372da48bcb39788255982f31335d28
Author: Michael Biebl <biebl debian org>
Date: Fri Nov 6 19:59:12 2009 +0100
Bug 600998 â?? We are using Xkb* functions, so make sure we link against libX11
Otherwise the build fails on stricter linkers, like binutils-gold
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554650
https://bugzilla.gnome.org/show_bug.cgi?id=600998
Signed-off-by: David Zeuthen <davidz redhat com>
configure.ac | 3 +--
src/palimpsest/Makefile.am | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a722b2c..4d30d4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,8 +146,7 @@ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED)
PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
PKG_CHECK_MODULES(UDISKS, udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION)
-
-
+PKG_CHECK_MODULES(X11, [x11])
PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
AC_SUBST(LIBATASMART_CFLAGS)
AC_SUBST(LIBATASMART_LIBS)
diff --git a/src/palimpsest/Makefile.am b/src/palimpsest/Makefile.am
index 1fab22b..eb4a9c0 100644
--- a/src/palimpsest/Makefile.am
+++ b/src/palimpsest/Makefile.am
@@ -32,6 +32,7 @@ palimpsest_CFLAGS = \
$(GNOME_KEYRING_CFLAGS) \
$(GTK2_CFLAGS) \
$(UNIQUE_CFLAGS) \
+ $(X11_CFLAGS) \
$(WARN_CFLAGS) \
$(AM_CFLAGS)
@@ -46,6 +47,7 @@ palimpsest_LDADD = \
$(GNOME_KEYRING_LIBS) \
$(GTK2_LIBS) \
$(UNIQUE_LIBS) \
+ $(X11_LIBS) \
$(INTLLIBS) \
$(top_builddir)/src/gdu/libgdu.la \
$(top_builddir)/src/gdu-gtk/libgdu-gtk.la
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]