- Added the support for a system configuration file which is

	  under /etc/gcompris.conf on GNU/Linux and in it's root installation
	  directory on Windows.
	  This file if present is loaded after the user one so it overwrite the user
	  properties.


svn path=/trunk/; revision=2696

1 files changed, 15 insertions, 0 deletions

diff --git a/configure.in b/configure.in
index 41d4311..f26ece8 100644
--- a/configure.in
+++ b/configure.in
@@ -322,6 +322,9 @@ if test "x$platform_win32" = "xno" ; then
   PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
   AC_SUBST(PYTHON_PLUGIN_DIR)
 
+  dnl System GCompris config directory
+  AC_DEFINE_UNQUOTED(SYSTEM_CONFIG_DIR, "/etc", [System GCompris config directory])
+
 else
   DATADIRNAME="share"
 
@@ -537,6 +540,18 @@ fi
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 
+dnl disable activation code
+AC_ARG_ENABLE(activation-code,
+          AC_HELP_STRING(
+          [--disable-activation-code],
+          [For Windows version, disable the activation code]),
+          activation_code="$enableval", activation_code="yes")
+
+if test x$activation_code = xno; then
+  AC_DEFINE([DISABLE_ACTIVATION_CODE], 1,[Activation code is disabled])
+fi
+
+
 #mypaint
 #PKG_CHECK_MODULES(MYPAINT,[
 #        glib-2.0 >= 2.6.0