Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/configure
- Timestamp:
- Mar 18, 2005, 11:52:15 AM (20 years ago)
-
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:
-
- 1 edited
-
orxonox/branches/levelloader/configure (modified) (26 diffs)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/levelloader/configure
r3563 r3605 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.59 for orxonox 0.2. 1-pre-alpha.3 # Generated by GNU Autoconf 2.59 for orxonox 0.2.2-pre-alpha. 4 4 # 5 5 # Report bugs to <orxonox-dev at mail.datacore.ch>. … … 270 270 PACKAGE_NAME='orxonox' 271 271 PACKAGE_TARNAME='orxonox' 272 PACKAGE_VERSION='0.2. 1-pre-alpha'273 PACKAGE_STRING='orxonox 0.2. 1-pre-alpha'272 PACKAGE_VERSION='0.2.2-pre-alpha' 273 PACKAGE_STRING='orxonox 0.2.2-pre-alpha' 274 274 PACKAGE_BUGREPORT='orxonox-dev at mail.datacore.ch' 275 275 … … 312 312 #endif" 313 313 314 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 DO XYGEN 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'314 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' 315 315 ac_subst_files='' 316 316 … … 789 789 # This message is too long to be a string in the A/UX 3.1 sh. 790 790 cat <<_ACEOF 791 \`configure' configures orxonox 0.2. 1-pre-alpha to adapt to many kinds of systems.791 \`configure' configures orxonox 0.2.2-pre-alpha to adapt to many kinds of systems. 792 792 793 793 Usage: $0 [OPTION]... [VAR=VALUE]... … … 856 856 if test -n "$ac_init_help"; then 857 857 case $ac_init_help in 858 short | recursive ) echo "Configuration of orxonox 0.2. 1-pre-alpha:";;858 short | recursive ) echo "Configuration of orxonox 0.2.2-pre-alpha:";; 859 859 esac 860 860 cat <<\_ACEOF … … 867 867 --enable-debug compiles in debug mode. Lots of debug info about the 868 868 game. 869 --disable-modular-debug compiles in modular-debug mode, that logs 870 differently on the many modules of orxonox. 869 871 --enable-sub-projects also builds the subProjects while make from srcdir 872 --enable-documentation also builds the sDocumentation while make from 873 srcdir 870 874 871 875 Optional Packages: … … 988 992 if $ac_init_version; then 989 993 cat <<\_ACEOF 990 orxonox configure 0.2. 1-pre-alpha994 orxonox configure 0.2.2-pre-alpha 991 995 generated by GNU Autoconf 2.59 992 996 … … 1002 1006 running configure, to aid debugging if configure makes a mistake. 1003 1007 1004 It was created by orxonox $as_me 0.2. 1-pre-alpha, which was1008 It was created by orxonox $as_me 0.2.2-pre-alpha, which was 1005 1009 generated by GNU Autoconf 2.59. Invocation command line was 1006 1010 … … 1599 1603 fi 1600 1604 1601 if mkdir -p -- . 2>/dev/null; then1605 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then 1602 1606 # Keeping the `.' argument allows $(mkdir_p) to be used without 1603 1607 # argument. Indeed, we sometimes output rules like … … 1612 1616 # directories to create, and then abort because `.' already 1613 1617 # exists. 1614 for d in ./-p ./-- ;1618 for d in ./-p ./--version; 1615 1619 do 1616 1620 test -d $d && rmdir $d … … 1722 1726 # Define the identity of the package. 1723 1727 PACKAGE='orxonox' 1724 VERSION='0.2. 1-pre-alpha'1728 VERSION='0.2.2-pre-alpha' 1725 1729 1726 1730 … … 2518 2522 for i in 1 2 3 4 5 6; do 2519 2523 echo '#include "conftst'$i'.h"' >> sub/conftest.c 2520 : > sub/conftst$i.h 2524 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 2525 # Solaris 8's {/usr,}/bin/sh. 2526 touch sub/conftst$i.h 2521 2527 done 2522 2528 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf … … 2546 2552 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then 2547 2553 # icc doesn't choke on unknown options, it will just issue warnings 2548 # (even with -Werror). So we grep stderr for any message 2549 # that says an option was ignored. 2550 if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else 2554 # or remarks (even with -Werror). So we grep stderr for any message 2555 # that says an option was ignored or not supported. 2556 # When given -MP, icc 7.0 and 7.1 complain thusly: 2557 # icc: Command line warning: ignoring option '-M'; no argument required 2558 # The diagnosis changed in icc 8.0: 2559 # icc: Command line remark: option '-MP' not supported 2560 if (grep 'ignoring option' conftest.err || 2561 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else 2551 2562 am_cv_CXX_dependencies_compiler_type=$depmode 2552 2563 break … … 3349 3360 for i in 1 2 3 4 5 6; do 3350 3361 echo '#include "conftst'$i'.h"' >> sub/conftest.c 3351 : > sub/conftst$i.h 3362 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 3363 # Solaris 8's {/usr,}/bin/sh. 3364 touch sub/conftst$i.h 3352 3365 done 3353 3366 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf … … 3377 3390 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then 3378 3391 # icc doesn't choke on unknown options, it will just issue warnings 3379 # (even with -Werror). So we grep stderr for any message 3380 # that says an option was ignored. 3381 if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else 3392 # or remarks (even with -Werror). So we grep stderr for any message 3393 # that says an option was ignored or not supported. 3394 # When given -MP, icc 7.0 and 7.1 complain thusly: 3395 # icc: Command line warning: ignoring option '-M'; no argument required 3396 # The diagnosis changed in icc 8.0: 3397 # icc: Command line remark: option '-MP' not supported 3398 if (grep 'ignoring option' conftest.err || 3399 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else 3382 3400 am_cv_CC_dependencies_compiler_type=$depmode 3383 3401 break … … 3846 3864 if test x$DEBUG = xno; then 3847 3865 echo "no" 3848 echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed."3849 DEBUG= 33866 echo " -> Setting debuglevel to 4. (orxonox is still in Development. It really is needed." 3867 DEBUG=4 3850 3868 elif test x$DEBUG = xyes; then 3851 3869 echo "yes" … … 3862 3880 3863 3881 3882 3883 #---------------# 3884 # Modular Debug # 3885 #---------------# 3886 MODULAR_DEBUG=yes 3887 echo "$as_me:$LINENO: checking if Modular-DEBUG-mode should be ebabled" >&5 3888 echo $ECHO_N "checking if Modular-DEBUG-mode should be ebabled... $ECHO_C" >&6 3889 # Check whether --enable-modular-debug or --disable-modular-debug was given. 3890 if test "${enable_modular_debug+set}" = set; then 3891 enableval="$enable_modular_debug" 3892 MODULAR_DEBUG=$enableval 3893 fi; 3894 3895 if test x$MODULAR_DEBUG = xno; then 3896 echo "no" 3897 elif test x$MODULAR_DEBUG = xyes; then 3898 echo "yes" 3899 3900 cat >>confdefs.h <<_ACEOF 3901 #define MODULAR_DEBUG 1 3902 _ACEOF 3903 3904 fi 3864 3905 3865 3906 #--------------# … … 3961 4002 echo "no" 3962 4003 fi 4004 3963 4005 #-------------------# 3964 4006 # SubProject-enable # … … 3988 4030 fi 3989 4031 4032 4033 #----------------------# 4034 # Documentation-enable # 4035 #----------------------# 4036 def_documentation=no 4037 echo "$as_me:$LINENO: checking if the Documentation should be build by default" >&5 4038 echo $ECHO_N "checking if the Documentation should be build by default... $ECHO_C" >&6 4039 # Check whether --enable-documentation or --disable-documentation was given. 4040 if test "${enable_documentation+set}" = set; then 4041 enableval="$enable_documentation" 4042 def_documentation=yes 4043 fi; 4044 if test x$def_documentation = xyes; then 4045 echo "yes" 4046 fi 4047 if test x$def_documentation = xno; then 4048 echo "no" 4049 fi 4050 4051 4052 if test x$def_documentation = xyes; then 4053 DOCUMENTATION_TRUE= 4054 DOCUMENTATION_FALSE='#' 4055 else 4056 DOCUMENTATION_TRUE='#' 4057 DOCUMENTATION_FALSE= 4058 fi 3990 4059 3991 4060 ####################### … … 8168 8237 ## OUTPUT CONFIGURE ## 8169 8238 ###################### 8170 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"8239 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" 8171 8240 8172 8241 … … 8287 8356 Usually this means the macro was only invoked conditionally." >&5 8288 8357 echo "$as_me: error: conditional \"SUB_PROJECTS\" was never defined. 8358 Usually this means the macro was only invoked conditionally." >&2;} 8359 { (exit 1); exit 1; }; } 8360 fi 8361 if test -z "${DOCUMENTATION_TRUE}" && test -z "${DOCUMENTATION_FALSE}"; then 8362 { { echo "$as_me:$LINENO: error: conditional \"DOCUMENTATION\" was never defined. 8363 Usually this means the macro was only invoked conditionally." >&5 8364 echo "$as_me: error: conditional \"DOCUMENTATION\" was never defined. 8289 8365 Usually this means the macro was only invoked conditionally." >&2;} 8290 8366 { (exit 1); exit 1; }; } … … 8589 8665 cat >&5 <<_CSEOF 8590 8666 8591 This file was extended by orxonox $as_me 0.2. 1-pre-alpha, which was8667 This file was extended by orxonox $as_me 0.2.2-pre-alpha, which was 8592 8668 generated by GNU Autoconf 2.59. Invocation command line was 8593 8669 … … 8652 8728 cat >>$CONFIG_STATUS <<_ACEOF 8653 8729 ac_cs_version="\\ 8654 orxonox config.status 0.2. 1-pre-alpha8730 orxonox config.status 0.2.2-pre-alpha 8655 8731 configured by $0, generated by GNU Autoconf 2.59, 8656 8732 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" … … 8770 8846 "src/lib/gui/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/console/Makefile" ;; 8771 8847 "src/lib/gui/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/gui/Makefile" ;; 8848 "src/subprojects/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/Makefile" ;; 8849 "src/subprojects/testmain/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/testmain/Makefile" ;; 8772 8850 "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; 8773 8851 "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; … … 8916 8994 s,@SUB_PROJECTS_TRUE@,$SUB_PROJECTS_TRUE,;t t 8917 8995 s,@SUB_PROJECTS_FALSE@,$SUB_PROJECTS_FALSE,;t t 8996 s,@DOCUMENTATION_TRUE@,$DOCUMENTATION_TRUE,;t t 8997 s,@DOCUMENTATION_FALSE@,$DOCUMENTATION_FALSE,;t t 8918 8998 s,@DOXYGEN@,$DOXYGEN,;t t 8919 8999 s,@DOXYGEN_TRUE@,$DOXYGEN_TRUE,;t t … … 9559 9639 # Extract the definition of DEP_FILES from the Makefile without 9560 9640 # running `make'. 9561 DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`9641 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 9562 9642 test -z "$DEPDIR" && continue 9563 9643 # When using ansi2knr, U may be empty or an underscore; expand it 9564 U=`sed -n -e '/^U = / s///p' < "$mf"`9644 U=`sed -n 's/^U = //p' < "$mf"` 9565 9645 test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" 9566 9646 # We invoke sed twice because it is the simplest approach to 9567 9647 # changing $(DEPDIR) to its actual value in the expansion. 9568 for file in `sed -n -e'9648 for file in `sed -n ' 9569 9649 /^DEP_FILES = .*\\\\$/ { 9570 9650 s/^DEP_FILES = //
Note: See TracChangeset
for help on using the changeset viewer.
