Index: orxonox/branches/textEngine/configure
===================================================================
--- orxonox/branches/textEngine/configure	(revision 3467)
+++ orxonox/branches/textEngine/configure	(revision 3681)
@@ -1,5 +1,5 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for orxonox 0.2.1-pre-alpha.
+# Generated by GNU Autoconf 2.59 for orxonox 0.2.2-pre-alpha.
 #
 # Report bugs to <orxonox-dev at mail.datacore.ch>.
@@ -270,6 +270,6 @@
 PACKAGE_NAME='orxonox'
 PACKAGE_TARNAME='orxonox'
-PACKAGE_VERSION='0.2.1-pre-alpha'
-PACKAGE_STRING='orxonox 0.2.1-pre-alpha'
+PACKAGE_VERSION='0.2.2-pre-alpha'
+PACKAGE_STRING='orxonox 0.2.2-pre-alpha'
 PACKAGE_BUGREPORT='orxonox-dev at mail.datacore.ch'
 
@@ -312,5 +312,5 @@
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -789,5 +789,5 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures orxonox 0.2.1-pre-alpha to adapt to many kinds of systems.
+\`configure' configures orxonox 0.2.2-pre-alpha to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -856,5 +856,5 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of orxonox 0.2.1-pre-alpha:";;
+     short | recursive ) echo "Configuration of orxonox 0.2.2-pre-alpha:";;
    esac
   cat <<\_ACEOF
@@ -867,5 +867,9 @@
   --enable-debug          compiles in debug mode. Lots of debug info about the
                           game.
+  --disable-modular-debug compiles in modular-debug mode, that logs
+                          differently on the many modules of orxonox.
   --enable-sub-projects   also builds the subProjects while make from srcdir
+  --enable-documentation  also builds the sDocumentation while make from
+                          srcdir
 
 Optional Packages:
@@ -988,5 +992,5 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-orxonox configure 0.2.1-pre-alpha
+orxonox configure 0.2.2-pre-alpha
 generated by GNU Autoconf 2.59
 
@@ -1002,5 +1006,5 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by orxonox $as_me 0.2.1-pre-alpha, which was
+It was created by orxonox $as_me 0.2.2-pre-alpha, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -1722,5 +1726,5 @@
 # Define the identity of the package.
  PACKAGE='orxonox'
- VERSION='0.2.1-pre-alpha'
+ VERSION='0.2.2-pre-alpha'
 
 
@@ -3860,6 +3864,6 @@
 if test x$DEBUG = xno; then
 	echo "no"
-	echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed."
-	DEBUG=3
+	echo " -> Setting debuglevel to 4. (orxonox is still in Development. It really is needed."
+	DEBUG=4
 elif test x$DEBUG = xyes; then
 	echo "yes"
@@ -3876,4 +3880,27 @@
 
 
+
+#---------------#
+# Modular Debug #
+#---------------#
+MODULAR_DEBUG=yes
+echo "$as_me:$LINENO: checking if Modular-DEBUG-mode should be ebabled" >&5
+echo $ECHO_N "checking if Modular-DEBUG-mode should be ebabled... $ECHO_C" >&6
+# Check whether --enable-modular-debug or --disable-modular-debug was given.
+if test "${enable_modular_debug+set}" = set; then
+  enableval="$enable_modular_debug"
+  MODULAR_DEBUG=$enableval
+fi;
+
+if test x$MODULAR_DEBUG = xno; then
+	echo "no"
+elif test x$MODULAR_DEBUG = xyes; then
+	echo "yes"
+
+cat >>confdefs.h <<_ACEOF
+#define MODULAR_DEBUG 1
+_ACEOF
+
+fi
 
 #--------------#
@@ -3975,4 +4002,5 @@
   echo "no"
 fi
+
 #-------------------#
 # SubProject-enable #
@@ -4002,4 +4030,31 @@
 fi
 
+
+#----------------------#
+# Documentation-enable #
+#----------------------#
+def_documentation=no
+echo "$as_me:$LINENO: checking if the Documentation should be build by default" >&5
+echo $ECHO_N "checking if the Documentation should be build by default... $ECHO_C" >&6
+# Check whether --enable-documentation or --disable-documentation was given.
+if test "${enable_documentation+set}" = set; then
+  enableval="$enable_documentation"
+  def_documentation=yes
+fi;
+if test x$def_documentation = xyes; then
+  echo "yes"
+fi
+if test x$def_documentation = xno; then
+  echo "no"
+fi
+
+
+if test x$def_documentation = xyes; then
+  DOCUMENTATION_TRUE=
+  DOCUMENTATION_FALSE='#'
+else
+  DOCUMENTATION_TRUE='#'
+  DOCUMENTATION_FALSE=
+fi
 
 #######################
@@ -8182,5 +8237,5 @@
 ## OUTPUT CONFIGURE ##
 ######################
-                                                  ac_config_files="$ac_config_files Makefile src/Makefile src/importer/Makefile src/console/Makefile src/gui/Makefile"
+                                                                                                    ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/gui/Makefile src/lib/gui/console/Makefile src/lib/gui/gui/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile"
 
 
@@ -8301,4 +8356,11 @@
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"SUB_PROJECTS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${DOCUMENTATION_TRUE}" && test -z "${DOCUMENTATION_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"DOCUMENTATION\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"DOCUMENTATION\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
@@ -8603,5 +8665,5 @@
 cat >&5 <<_CSEOF
 
-This file was extended by orxonox $as_me 0.2.1-pre-alpha, which was
+This file was extended by orxonox $as_me 0.2.2-pre-alpha, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -8666,5 +8728,5 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-orxonox config.status 0.2.1-pre-alpha
+orxonox config.status 0.2.2-pre-alpha
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -8778,7 +8840,12 @@
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;;
-  "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
-  "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;;
+  "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
+  "src/lib/graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/Makefile" ;;
+  "src/lib/graphics/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/importer/Makefile" ;;
+  "src/lib/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/Makefile" ;;
+  "src/lib/gui/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/console/Makefile" ;;
+  "src/lib/gui/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/gui/Makefile" ;;
+  "src/subprojects/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/Makefile" ;;
+  "src/subprojects/testmain/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/testmain/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
@@ -8927,4 +8994,6 @@
 s,@SUB_PROJECTS_TRUE@,$SUB_PROJECTS_TRUE,;t t
 s,@SUB_PROJECTS_FALSE@,$SUB_PROJECTS_FALSE,;t t
+s,@DOCUMENTATION_TRUE@,$DOCUMENTATION_TRUE,;t t
+s,@DOCUMENTATION_FALSE@,$DOCUMENTATION_FALSE,;t t
 s,@DOXYGEN@,$DOXYGEN,;t t
 s,@DOXYGEN_TRUE@,$DOXYGEN_TRUE,;t t
