Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2009-03-04 21:05:55 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2009-03-04 21:05:55 (GMT)
commitf63cbd8e9c22a7182b4905d44e9f18697a15bccc (patch)
tree3b86f6da9a8024fa7011921739ec69e9f59a1b22
parentc3e7098b76f3154328be00f3064e1b582abbaff6 (diff)
- gnet is now enable by default.
Merged from trunk 3758 svn path=/branches/GCOMPRIS_8_3/; revision=3759
-rw-r--r--ChangeLog7
-rw-r--r--configure.in6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f898b1..5c1acb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-04 Bruno coudoin <bruno.coudoin@free.fr>
+
+ - gnet is now enable by default.
+ Merged from trunk 3758
+
+ * configure.in:
+
2009-02-28 Bruno coudoin <bruno.coudoin@free.fr>
- Patch from Johan Cwiklinski <mailings x-tnd.be>
diff --git a/configure.in b/configure.in
index f7f181d..b5e8a9a 100644
--- a/configure.in
+++ b/configure.in
@@ -398,14 +398,14 @@ if test x$TETEX = xno; then
AC_MSG_WARN(Couldn't find texi2html usualy in the tetex package, please install it)
fi
-
+
dnl GNET support
AC_MSG_CHECKING([wether we build with GNET (if not, networking will be disabled)])
AC_ARG_ENABLE(gnet,
AC_HELP_STRING(
[--disable-gnet],
- [Turn on gnet (will let GCompris fetch content from a web server)]),
- with_gnet="$enableval", with_gnet="no")
+ [Turn off gnet (will not let GCompris fetch content from a web server)]),
+ with_gnet="$enableval", with_gnet="yes")
AC_MSG_RESULT($with_gnet)
if test x$with_gnet = xyes; then