[gnome-panel] build: explicitly link to xrandr
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] build: explicitly link to xrandr
- Date: Tue, 14 Sep 2010 07:57:03 +0000 (UTC)
commit 787dc4c9b1d433829de03b6c89df3a748bddc31d
Author: Vincent Untz <vuntz gnome org>
Date: Tue Sep 14 09:53:08 2010 +0200
build: explicitly link to xrandr
https://bugzilla.gnome.org/show_bug.cgi?id=629562
configure.ac | 8 +++-----
gnome-panel/Makefile.am | 2 ++
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7529bd6..dd4db7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,11 +235,9 @@ AC_SUBST(X_LIBS)
dnl X RANDR extension
-if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
- have_randr=yes
-else
- have_randr=no
+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, have_randr=yes, have_randr=no)
+if test "x$have_randr" = "xyes"; then
+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
fi
dnl Modules dir
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 0993dfe..bf5d2dc 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -19,6 +19,7 @@ INCLUDES = \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
$(DISABLE_DEPRECATED_CFLAGS) \
$(PANEL_CFLAGS) \
+ $(XRANDR_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@@ -152,6 +153,7 @@ gnome_panel_LDADD = \
$(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la \
$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
$(PANEL_LIBS) \
+ $(XRANDR_LIBS) \
$(X_LIBS)
gnome_panel_LDFLAGS = -export-dynamic
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]