Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/configure.ac

Timestamp:

Mar 18, 2005, 11:52:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/configure.ac (modified) (6 diffs)

orxonox/branches/levelloader/configure.ac

@@ -23 +23 @@
 #########################
 AC_PREREQ(2.56)
-AC_INIT(orxonox, 0.2.1-pre-alpha, [orxonox-dev at mail.datacore.ch])
+AC_INIT(orxonox, 0.2.2-pre-alpha, [orxonox-dev at mail.datacore.ch])
 
 ## Detect the canonical host and target build environment.
@@ -56 +56 @@
 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"
@@ -68 +68 @@
 
 AC_SUBST(DEBUG)
+
+#---------------#
+# Modular Debug #
+#---------------#
+MODULAR_DEBUG=yes
+AC_MSG_CHECKING([if Modular-DEBUG-mode should be ebabled])
+AC_ARG_ENABLE([modular-debug], 
+        AC_HELP_STRING( [--disable-modular-debug], [compiles in modular-debug mode, that logs differently on the many modules of orxonox.]),
+         MODULAR_DEBUG=$enableval)
+
+if test x$MODULAR_DEBUG = xno; then 
+        echo "no"
+elif test x$MODULAR_DEBUG = xyes; then
+        echo "yes"
+        AC_DEFINE_UNQUOTED(MODULAR_DEBUG, 1, [if Modular-DUBUG mode is enabled])
+fi
 
 #--------------#
@@ -139 +155 @@
   echo "no"
 fi
+
 #-------------------#
 # SubProject-enable #
@@ -155 +172 @@
 AM_CONDITIONAL(SUB_PROJECTS, test x$def_sub_projects = xyes)
 
+#----------------------#
+# Documentation-enable #
+#----------------------#
+def_documentation=no
+AC_MSG_CHECKING([if the Documentation should be build by default])
+AC_ARG_ENABLE([documentation], 
+        AC_HELP_STRING( [--enable-documentation], 
+        [also builds the sDocumentation while make from srcdir]), [def_documentation=yes]) 
+if test x$def_documentation = xyes; then
+  echo "yes"
+fi 
+if test x$def_documentation = xno; then
+  echo "no"
+fi
+AM_CONDITIONAL(DOCUMENTATION, test x$def_documentation = xyes)
 #######################
 ## PROGRAMM CHECKING ##
@@ -534 +566 @@
                  src/lib/gui/Makefile
                  src/lib/gui/console/Makefile
-                 src/lib/gui/gui/Makefile])
+                 src/lib/gui/gui/Makefile
+                 src/subprojects/Makefile
+                 src/subprojects/testmain/Makefile])
 
 AC_OUTPUT