[the-board] [build] Use separate build cflags/libs for libthe-board
- From: Lucas Rocha <lucasr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [the-board] [build] Use separate build cflags/libs for libthe-board
- Date: Fri, 25 Mar 2011 22:59:46 +0000 (UTC)
commit e282dad3f3ccb6c561313a3274ebb3b46096313c
Author: Lucas Rocha <lucasr gnome org>
Date: Tue Mar 22 00:46:38 2011 +0000
[build] Use separate build cflags/libs for libthe-board
We don't want to use gjs-1.0 when generating introspection files for
libthe-board as it fails to build because libmozjs is missing from
linker path somehow (e.g. Ubuntu).
configure.ac | 8 ++++++++
src/Makefile-tb.am | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2a9c609..214dab9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,14 @@ PKG_CHECK_MODULES(THE_BOARD,
clutter-gtk-1.0 >= $CLUTTER_GTK_MIN_VERSION
clutter-gst-1.0 >= $CLUTTER_GST_MIN_VERSION)
+PKG_CHECK_MODULES(TB,
+ glib-2.0 >= $GLIB_MIN_VERSION
+ gobject-2.0 >= $GLIB_MIN_VERSION
+ clutter-1.0 >= $CLUTTER_MIN_VERSION
+ mx-1.0 >= $MX_MIN_VERSION
+ gtk+-3.0 >= $GTK_MIN_VERSION
+ gstreamer-0.10)
+
AC_ARG_WITH([libnotify],
AC_HELP_STRING([--without-libnotify],[disable libnotify support]),,
[with_libnotify=yes])
diff --git a/src/Makefile-tb.am b/src/Makefile-tb.am
index 6a4b94c..d467272 100644
--- a/src/Makefile-tb.am
+++ b/src/Makefile-tb.am
@@ -4,7 +4,7 @@ tb_cflags = \
-DLIBDIR=\"$(libdir)\" \
-DG_LOG_DOMAIN=\"TheBoard\" \
-DG_DISABLE_DEPRECATED \
- $(THE_BOARD_CFLAGS)
+ $(TB_CFLAGS)
if HAVE_LIBSOUP
tb_cflags += $(LIBSOUP_CFLAGS)
@@ -67,7 +67,7 @@ tb-enum-types.c: stamp-tb-enum-types.h tb/tb-enum-types.c.in
lib_LTLIBRARIES += libthe-board-1.0.la
libthe_board_1_0_la_LIBADD = \
- $(THE_BOARD_LIBS)
+ $(TB_LIBS)
if HAVE_LIBSOUP
libthe_board_1_0_la_LIBADD += $(LIBSOUP_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]