[gcompris] remove external gnuchess dependency.
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris] remove external gnuchess dependency.
- Date: Sun, 2 Dec 2012 23:35:14 +0000 (UTC)
commit b851491aa25ad63c35f6463975822de6f936ef29
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Mon Dec 3 00:32:07 2012 +0100
remove external gnuchess dependency.
We already have our own version of GnuChess that we know works
fine with us.
Recently GNU/Linux distribution's own version of GnuChess no more
work with us. I am bored having to fix this years after years.
This patch removes the ability to compile GCompris with an external
GnuChess. Now we always compile and ship our own.
configure.ac | 21 +--------------------
src/chess_computer-activity/Makefile.am | 4 ----
2 files changed, 1 insertions(+), 24 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bda3e8e..40325ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,13 +216,6 @@ AC_ARG_ENABLE(disable-activation-code,
[For Windows or MacOSX version, disable the activation code]),
disable_activation_code="$enableval", disable_activation_code="no")
-dnl internal GnuChess
-AC_ARG_ENABLE(build-gnuchess,
- AC_HELP_STRING(
- [--enable-build-gnuchess],
- [For Gnu/Linux, compile our version of GnuChess]),
- build_gnuchess="$enableval", build_gnuchess="no")
-
dnl WIN32 Specifics
AC_MSG_CHECKING([for Win32 platform in general])
case "$host" in
@@ -307,7 +300,6 @@ if test "x$platform_win32" = "xyes" ; then
dnl Test for gnuchess
AC_DEFINE_UNQUOTED(GNUCHESS, "gnuchess.exe", Defines where GNU Chess resides on the system)
- build_gnuchess=yes
if test x$disable_activation_code = xno; then
AC_DEFINE([ACTIVATION_CODE], 1,[Activation code is enabled])
@@ -338,7 +330,6 @@ elif test "x$nsbundle" = "xyes" ; then
dnl Test for gnuchess
AC_DEFINE_UNQUOTED(GNUCHESS, "../Resources/bin/gcompris-gnuchess", Defines where GNU Chess resides on the system)
- build_gnuchess=yes
if test x$disable_activation_code = xno; then
AC_DEFINE([ACTIVATION_CODE], 1,[Activation code is enabled])
@@ -366,19 +357,11 @@ else
AC_DEFINE_UNQUOTED(SYSTEM_CONFIG_DIR, "/etc", [System GCompris config directory])
dnl Test for gnuchess
- if test x$build_gnuchess = xno; then
- AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/bin:/usr/games:/usr/local/bin:$PATH])
- else
- GNUCHESS="gcompris-gnuchess"
- fi
-
if test x$GNUCHESS = xno; then
- AC_MSG_ERROR([Couldn't find gnuchess, please install the gnuchess package version]
- [ 5 or above or define the environment variable GNUCHESS.])
+ GNUCHESS="gcompris-gnuchess"
fi
AC_DEFINE_UNQUOTED(GNUCHESS, "$GNUCHESS", Defines where GNU Chess resides on the system)
fi
-AM_CONDITIONAL(BUILD_GNUCHESS, test x$build_gnuchess != xno)
AC_PATH_PROG(TEXINFO, makeinfo,no)
if test x$TEXINFO = xno; then
@@ -928,8 +911,6 @@ echo "Python plugin = $build_python_plugin"
echo "SQLITE database (--enable-sqlite) = $with_sqlite (profiles depend on this)"
-echo "Internal GnuChess = $build_gnuchess (--enable-build-gnuchess)"
-
echo "Sugar DE Support = $with_sugar"
echo "BINRELOC (--enable-binreloc) = $br_cv_binreloc"
echo "NSBundle (--enable-nsbundle) = $nsbundle"
diff --git a/src/chess_computer-activity/Makefile.am b/src/chess_computer-activity/Makefile.am
index 05b5a81..868d325 100644
--- a/src/chess_computer-activity/Makefile.am
+++ b/src/chess_computer-activity/Makefile.am
@@ -1,10 +1,6 @@
include $(top_srcdir)/Makefile.activity
-if BUILD_GNUCHESS
SUBDIRS = resources gnuchess
-else
-SUBDIRS = resources
-endif
if PLATFORM_WIN32
shared = -shared
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]