[unique] build: Use GTK_CHECK_BACKEND macro
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [unique] build: Use GTK_CHECK_BACKEND macro
- Date: Sun, 27 Mar 2011 08:58:35 +0000 (UTC)
commit 6b645fa7b1008279b1e0f2e5c308239ad138ad15
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Sat Mar 26 18:49:32 2011 +0000
build: Use GTK_CHECK_BACKEND macro
Instead of calling pkg-config ourselves.
This fixes linker issues caused by the renamed target variable in
gtk+'s pkg-config file.
https://bugzilla.gnome.org/show_bug.cgi?id=645255
configure.ac | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1d402a0..e52f0f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,16 +68,15 @@ m4_define([dbus_required], [0.70])
PKG_CHECK_MODULES(UNIQUE, glib-2.0 >= glib_required dnl
gtk+-3.0 >= gtk_required)
-gdktarget=`$PKG_CONFIG --variable=target gdk-3.0`
-AS_IF([test "X$gdktarget" = "Xx11"],
- [
- AC_PATH_XTRA
+GTK_CHECK_BACKEND([x11], [gtk_required],
+ [
+ AC_PATH_XTRA
- PKG_CHECK_MODULES(UNIQUE_X11, x11)
+ PKG_CHECK_MODULES(UNIQUE_X11, x11)
- UNIQUE_CFLAGS="$UNIQUE_CFLAGS $UNIQUE_X11_CFLAGS"
- UNIQUE_LIBS="$UNIQUE_LIBS $UNIQUE_X11_LIBS"
- ]
+ UNIQUE_CFLAGS="$UNIQUE_CFLAGS $UNIQUE_X11_CFLAGS"
+ UNIQUE_LIBS="$UNIQUE_LIBS $UNIQUE_X11_LIBS"
+ ]
)
AC_SUBST(UNIQUE_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]