[gbrainy] Enable GNOME support for Linux build
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy] Enable GNOME support for Linux build
- Date: Mon, 17 Jan 2011 22:04:10 +0000 (UTC)
commit 3156ec9851987eb481890665211dc51dc5c6f61c
Author: Jordi Mas <jmas softcatala org>
Date: Mon Jan 17 23:04:55 2011 +0100
Enable GNOME support for Linux build
configure.ac | 20 ++++++++++++++++----
src/Clients/Classical/Makefile.am | 1 +
2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1d3c26e..d982282 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,9 +62,7 @@ MONO_ADDINS=0.3
PKG_CHECK_MODULES(GBRAINY_CORE, mono >= $MONO_REQUIRED)
-PKG_CHECK_MODULES(GBRAINY,
- gtk-sharp-2.0 >= $GTKSHARP_REQUIRED
- gnome-sharp-2.0 >= $GTKSHARP_REQUIRED)
+PKG_CHECK_MODULES(GBRAINY, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED)
AC_SUBST(GBRAINY_LIBS)
AC_ARG_ENABLE(addins, AC_HELP_STRING([--disable-addins], [Disable mono-addins support]), , enable_addins="yes")
@@ -137,7 +135,7 @@ dnl --- Debugging support
AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug],
- [Use 'Debug' Configuration [default=yes]]),
+ [Use 'Debug' Configuration [default=no]]),
enable_debug=$enableval, enable_debug=no)
AM_CONDITIONAL(ENABLE_DEBUG, test "x$enable_debug" != "xno")
@@ -145,6 +143,19 @@ if test "x$enable_debug" != "xno" ; then
CSC_DEFINES="$CSC_DEFINES -debug -d:DEBUG"
fi
+dnl --- Gnome support
+
+AC_ARG_ENABLE(gnome,
+ AC_HELP_STRING([--enable-gnome],
+ [Compile with GNOME support [default=yes]]),
+ enable_gnome=$enableval, enable_gnome=yes)
+
+if test "x$enable_gnome" != "xno" ; then
+ PKG_CHECK_MODULES(GNOME,gnome-sharp-2.0 >= $GTKSHARP_REQUIRED)
+ AC_SUBST(GNOME_LIBS)
+ CSC_DEFINES="$CSC_DEFINES -d:GNOME"
+fi
+
dnl --- Assembly information
BUILD_TIME=`date +"%F %T %Z"`
@@ -192,6 +203,7 @@ data/gbrainy.pc
help/Makefile
])
+echo "GNOME enabled: ${enable_gnome}"
echo "Mono-addins: ${enable_addins_sharp}"
echo "NUnit: ${enable_tests}"
echo "Debug enabled: ${enable_debug}"
diff --git a/src/Clients/Classical/Makefile.am b/src/Clients/Classical/Makefile.am
index cd70a75..bdb5e6f 100644
--- a/src/Clients/Classical/Makefile.am
+++ b/src/Clients/Classical/Makefile.am
@@ -25,6 +25,7 @@ GBRAINY_CSDISTFILES = \
ASSEMBLIES = \
$(GBRAINY_LIBS) \
$(MONO_ADDINS_LIBS) \
+ $(GNOME_LIBS) \
-r:Mono.Cairo.dll \
-r:../../gbrainy.Core.dll \
-r:Mono.Posix
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]