Changeset 3424 in orxonox.OLD
- Timestamp:
- Feb 27, 2005, 7:51:36 PM (19 years ago)
- Location:
- orxonox/trunk
- Files:
-
- 6 edited
-
configure (modified) (43 diffs)
-
configure.ac (modified) (25 diffs)
-
src/Makefile.in (modified) (1 diff)
-
src/console/Makefile.in (modified) (1 diff)
-
src/gui/Makefile.in (modified) (1 diff)
-
src/importer/Makefile.in (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/configure
r3423 r3424 867 867 --enable-debug compiles in debug mode. Lots of debug info about the 868 868 game. 869 --enable-sub-projects also builds the subProjects by default869 --enable-sub-projects also builds the subProjects while make from srcdir 870 870 871 871 Optional Packages: … … 1339 1339 1340 1340 1341 # Detect the canonical host and target build environment.1341 ## Detect the canonical host and target build environment. 1342 1342 ac_aux_dir= 1343 1343 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do … … 1447 1447 NONENONEs,x,x, && 1448 1448 program_prefix=${target_alias}- 1449 1450 1449 1451 1450 am__api_version="1.8" … … 1854 1853 1855 1854 1856 1857 # Checks for programs. 1855 ######################### 1856 ## Checks for programs ## 1857 ######################### 1858 1858 ac_ext=cc 1859 1859 ac_cpp='$CXXCPP $CPPFLAGS' … … 3842 3842 3843 3843 3844 ### CHECKING OPTIONAT ARGUMENTS 3845 ## DEBUG-statement 3844 ################################## 3845 ## CHECKING OPTIONAL ARGUMENTS ## 3846 ################################## 3847 3848 #-----------------# 3849 # DEBUG-statement # 3850 #-----------------# 3846 3851 DEBUG=no 3847 3852 echo "$as_me:$LINENO: checking if DEBUG-mode should be enabled" >&5 … … 3853 3858 fi; 3854 3859 3855 if test "$DEBUG" = "no"; then3860 if test x$DEBUG = xno; then 3856 3861 echo "no" 3857 echo " -> Setting debuglevel to 1. Like this you can still see errors."3858 DEBUG= 13859 elif test "$DEBUG" =yes; then3862 echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed." 3863 DEBUG=3 3864 elif test x$DEBUG = xyes; then 3860 3865 echo "yes" 3861 echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!."3862 DEBUG= 33863 else 3864 echo "yes setto $DEBUG"3866 echo " -> Setting debuglevel to 4. HARD DEBUG MODE!!." 3867 DEBUG=4 3868 else 3869 echo "yes: setting debuglevel to to $DEBUG" 3865 3870 fi 3866 3871 … … 3872 3877 3873 3878 3874 ## GTK-disabled 3879 #--------------# 3880 # GTK-disabled # 3881 #--------------# 3875 3882 echo "$as_me:$LINENO: checking if gtk should be enabled" >&5 3876 3883 echo $ECHO_N "checking if gtk should be enabled... $ECHO_C" >&6 … … 3883 3890 def_gtk=yes 3884 3891 fi; 3885 if test "$def_gtk" =yes; then3892 if test x$def_gtk = xyes; then 3886 3893 echo "yes" 3887 3894 fi 3888 if test "$def_gtk" =no; then3895 if test x$def_gtk = xno; then 3889 3896 echo "no" 3890 3897 fi 3891 3898 3892 ## gThread-disabled 3899 #------------------# 3900 # gThread-disabled # 3901 #------------------# 3893 3902 echo "$as_me:$LINENO: checking if gThread should be enabled" >&5 3894 3903 echo $ECHO_N "checking if gThread should be enabled... $ECHO_C" >&6 … … 3901 3910 def_gthread=yes 3902 3911 fi; 3903 if test "$def_gthread" =yes; then3912 if test x$def_gthread = xyes; then 3904 3913 echo "yes" 3905 3914 fi 3906 if test "$def_gthread" =no; then3915 if test x$def_gthread = xno; then 3907 3916 echo "no" 3908 3917 fi 3909 3918 3910 ## pthread-disabled 3919 #------------------# 3920 # pthread-disabled # 3921 #------------------# 3911 3922 echo "$as_me:$LINENO: checking if pthread should be enabled" >&5 3912 3923 echo $ECHO_N "checking if pthread should be enabled... $ECHO_C" >&6 … … 3919 3930 def_pthread=yes 3920 3931 fi; 3921 if test "$def_pthread" =yes; then3932 if test x$def_pthread = xyes; then 3922 3933 echo "yes" 3923 3934 fi 3924 if test "$def_pthread" =no; then3935 if test x$def_pthread = xno; then 3925 3936 echo "no" 3926 3937 fi 3927 3938 3928 ## libCurl disabled? 3939 #------------------# 3940 # libCurl-disabled # 3941 #------------------# 3929 3942 echo "$as_me:$LINENO: checking if libcURL should be enabled" >&5 3930 3943 echo $ECHO_N "checking if libcURL should be enabled... $ECHO_C" >&6 … … 3937 3950 def_curl=yes 3938 3951 fi; 3939 if test "$def_curl" =yes; then3952 if test x$def_curl = xyes; then 3940 3953 echo "yes" 3941 3954 fi 3942 if test "$def_curl" =no; then3955 if test x$def_curl = xno; then 3943 3956 echo "no" 3944 3957 fi 3945 3958 3946 ### SDL_image-disable 3959 #-------------------# 3960 # SDL_image-disable # 3961 #-------------------# 3947 3962 def_sdl_image=yes 3948 3963 echo "$as_me:$LINENO: checking if SDL_image should be enabled" >&5 … … 3954 3969 def_sdl_image=no 3955 3970 fi; 3956 if test "$def_sdl_image" =yes; then3971 if test x$def_sdl_image = xyes; then 3957 3972 echo "yes" 3958 3973 fi 3959 if test "$def_sdl_image" =no; then3974 if test x$def_sdl_image = xno; then 3960 3975 echo "no" 3961 3976 fi 3962 3963 3964 # ## SubProject-enable3965 def_s dl_image=yes3977 #-------------------# 3978 # SubProject-enable # 3979 #-------------------# 3980 def_sub_projects=no 3966 3981 echo "$as_me:$LINENO: checking if the SubProjects should be built" >&5 3967 3982 echo $ECHO_N "checking if the SubProjects should be built... $ECHO_C" >&6 … … 3971 3986 def_sub_projects=yes 3972 3987 fi; 3973 if test "$def_sub_projects" =yes; then3988 if test x$def_sub_projects = xyes; then 3974 3989 echo "yes" 3975 3990 fi 3976 if test "$def_sub_projects" =no; then3991 if test x$def_sub_projects = xno; then 3977 3992 echo "no" 3978 3993 fi … … 3988 4003 3989 4004 3990 ## PROGRAMM CHECKING 3991 # checking for Doxygen 4005 ####################### 4006 ## PROGRAMM CHECKING ## 4007 ## 3. party Programs ## 4008 ####################### 4009 4010 #----------------------# 4011 # checking for Doxygen # 4012 #----------------------# 3992 4013 # Extract the first word of "doxygen", so it can be a program name with args. 3993 4014 set dummy doxygen; ac_word=$2 … … 4040 4061 4041 4062 4042 ### CHECKING FOR SYSTEM ### 4063 ######################### 4064 ## CHECKING FOR SYSTEM ## 4065 ######################### 4066 ## here the system is checked, and openGL is included 4067 ## also checking for SDL on differen Systems 4043 4068 4044 4069 echo "$as_me:$LINENO: checking for System" >&5 … … 4046 4071 ## checking for openGL-environment and other sys-specific parameters 4047 4072 case "$target" in 4048 ### WINDOWS ### 4073 #---------# 4074 # WINDOWS # 4075 #---------# 4049 4076 *-*-mingw32*) 4050 4077 echo "mingw-WINDOWS detected" … … 4349 4376 fi 4350 4377 4351 if test "$FOUND_opengl32" = "yes"; then4378 if test x$FOUND_opengl32 = xyes ; then 4352 4379 LIBS="$LIBS -lopengl32" 4353 4380 else … … 4578 4605 fi 4579 4606 4580 if test "$FOUND_glu32" = "yes"; then4607 if test x$FOUND_glu32 = xyes ; then 4581 4608 LIBS="$LIBS -lGLU32" 4582 4609 else … … 4651 4678 fi 4652 4679 4653 if test $FOUND_mingw32 = "yes"; then4680 if test x$FOUND_mingw32 = xyes; then 4654 4681 LIBS="$LIBS -lmingw32" 4655 4682 fi … … 4873 4900 fi 4874 4901 4875 if test "$FOUND_sdlmain" = "yes"; then4902 if test x$FOUND_sdlmain = xyes ; then 4876 4903 LIBS="$LIBS -lsdlmain" 4877 4904 else … … 4944 4971 fi 4945 4972 4946 if test "$FOUND_sdl" = "yes"; then4973 if test x$FOUND_sdl = xyes ; then 4947 4974 LIBS="$LIBS -lsdl" 4948 4975 else … … 4955 4982 4956 4983 ;; 4957 4958 ### LINUX ### 4984 #-------# 4985 # LINUX # 4986 #-------# 4959 4987 *-*-linux*) 4960 4988 echo "Linux detected" … … 5189 5217 fi 5190 5218 5191 if test "$FOUND_GL" = "yes"; then5219 if test x$FOUND_GL = xyes ; then 5192 5220 LIBS="$LIBS -lGL" 5193 5221 else … … 5423 5451 fi 5424 5452 5425 if test "$FOUND_GLU" = "yes"; then5453 if test x$FOUND_GLU = xyes ; then 5426 5454 LIBS="$LIBS -lGLU" 5427 5455 else … … 5652 5680 fi 5653 5681 5654 if test "$FOUND_SDL" = "yes"; then5682 if test x$FOUND_SDL = xyes ; then 5655 5683 LIBS="$LIBS -lSDL" 5656 5684 else … … 5672 5700 # LIBS="$LIBS $SDL_LIBS" 5673 5701 ;; 5674 5675 ### OS X ### 5702 #-----------# 5703 # MAC -OS X # 5704 #-----------# 5676 5705 *darwin*) 5677 echo "OS X detected"5706 echo "OS X detected" 5678 5707 5679 5708 osX="yes" … … 5993 6022 LIBS="$LIBS -framework OpenGL" 5994 6023 6024 SDL_CFLAGS=`sdl-config --cflags` 6025 SDL_LIBS=`sdl-config --libs` 6026 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" 6027 LIBS="$LIBS $SDL_LIBS" 6028 6029 5995 6030 # checking for SDL-headers 5996 6031 # AC_CHECK_HEADERS(SDL/SDL.h ,, … … 6004 6039 # ) 6005 6040 6006 SDL_CFLAGS=`sdl-config --cflags`6007 SDL_LIBS=`sdl-config --libs`6008 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"6009 LIBS="$LIBS $SDL_LIBS"6010 6041 6011 6042 ;; … … 6017 6048 6018 6049 6019 ## check for SDL_Image 6020 if test "$def_sdl_image" = "yes"; then 6050 ################################### 6051 ## CHECKING FOR HEADERS AND LIBS ## 6052 ################################### 6053 6054 #-----------# 6055 # SDL_Image # 6056 #-----------# 6057 if test x$def_sdl_image = xyes; then 6021 6058 # checking for SDL_image-headers 6022 6059 … … 6173 6210 6174 6211 fi 6175 if test "$def_sdl_image" = "yes"; then6212 if test x$def_sdl_image = xyes; then 6176 6213 # checking for SDL_image-lib 6177 6214 echo "$as_me:$LINENO: checking for main in -lSDL_image" >&5 … … 6237 6274 fi 6238 6275 6239 if test "$FOUND_SDL_image" = "yes"; then6276 if test x$FOUND_SDL_image = xyes ; then 6240 6277 LIBS="$LIBS -lSDL_image" 6241 6278 else … … 6248 6285 fi 6249 6286 6250 6251 if test "$def_sdl_image" = "no"; then 6252 ## checking for libjpeg 6287 ## case no SDL-image: 6288 if test x$def_sdl_image = xno; then 6289 #---------# 6290 # libjpeg # 6291 #---------# 6253 6292 6254 6293 for ac_header in jpeglib.h … … 6403 6442 done 6404 6443 6405 if test $jpegHeader = "no"; then6444 if test xjpegHeader = xno; then 6406 6445 echo " not including jpeg." 6407 6446 else … … 6468 6507 fi 6469 6508 6470 if test "$FOUND_jpeg" = "yes"; then6509 if test x$FOUND_jpeg = xyes ; then 6471 6510 LIBS="$LIBS -ljpeg" 6472 6511 else … … 6479 6518 fi 6480 6519 6481 ## checking for libpng 6520 #--------# 6521 # libpng # 6522 #--------# 6482 6523 6483 6524 for ac_header in png.h … … 6632 6673 done 6633 6674 6634 if test $pngHeader = "no"; then6675 if test x$pngHeader = xno; then 6635 6676 echo " not including png." 6636 6677 else … … 6697 6738 fi 6698 6739 6699 if test "$FOUND_png" = "yes"; then6740 if test x$FOUND_png = xyes ; then 6700 6741 LIBS="$LIBS -lpng" 6701 6742 else … … 6709 6750 fi 6710 6751 6711 ## checking for GTK 6712 if test "$def_gtk" = yes; then 6752 #-----# 6753 # GTK # 6754 #-----# 6755 if test x$def_gtk = xyes; then 6713 6756 6714 6757 #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no) … … 6743 6786 6744 6787 6745 ## checking for gThread 6746 if test "$def_gthread" = yes; then 6788 #---------# 6789 # gThread # 6790 #---------# 6791 if test x$def_gthread = xyes; then 6747 6792 6748 6793 echo "$as_me:$LINENO: checking for gthread" >&5 … … 6776 6821 6777 6822 6778 ## checking for libcURL 6779 if test "$def_curl" = yes; then 6823 #---------# 6824 # libcURL # 6825 #---------# 6826 if test x$def_curl = xyes; then 6780 6827 6781 6828 … … 7020 7067 7021 7068 7022 7023 ##checking for pthread 7069 #---------# 7070 # pthread # 7071 #---------# 7024 7072 if test x$def_pthread = xyes ; then 7025 7073 if test x$have_gthread = xyes ; then … … 7238 7286 fi 7239 7287 7240 if test "$FOUND_pthread" = "yes"; then7288 if test x$FOUND_pthread = xyes ; then 7241 7289 LIBS="$LIBS -lpthread" 7242 7290 fi 7243 7291 fi 7244 7292 fi 7293 7294 7245 7295 # FIXME: Replace `main' with a function in `-lm': 7246 7296 … … 8129 8179 8130 8180 8181 ###################### 8182 ## OUTPUT CONFIGURE ## 8183 ###################### 8131 8184 ac_config_files="$ac_config_files Makefile src/Makefile src/importer/Makefile src/console/Makefile src/gui/Makefile" 8132 8185 -
orxonox/trunk/configure.ac
r3423 r3424 1 # -*- Autoconf -*- 2 # Process this file with autoconf to produce a configure script. 3 1 ########################################################################## 2 # orxonox - the future of 3D-vertical-scrollers # 3 # # 4 # Copyright (C) 2004 orx # 5 # # 6 # This program is free software; you can redistribute it and/or modify # 7 # it under the terms of the GNU General Public License as published by # 8 # the Free Software Foundation; either version 2, or (at your option) # 9 # any later version. # 10 # # 11 # ### File Specific: # 12 # main-programmer: Benjamin Grauer # 13 # co-programmer: ... # 14 # # 15 # This is the main configuration File of autoconf. # 16 # Please edit this file only, if you exactly know what you are doing. # 17 # It is quite fragile, and compiling orxonox on different Platforms # 18 # is only guarantied, if build with the right config. # 19 ########################################################################## 20 21 ######################### 22 ## AUTOCONF INIT PHASE ## 23 ######################### 4 24 AC_PREREQ(2.56) 5 25 AC_INIT(orxonox, 0.2.1-pre-alpha, [orxonox-dev at mail.datacore.ch]) 6 26 7 # Detect the canonical host and target build environment.27 ## Detect the canonical host and target build environment. 8 28 AC_CANONICAL_BUILD 9 29 AC_CANONICAL_HOST 10 30 AC_CANONICAL_TARGET 11 31 12 13 32 AM_INIT_AUTOMAKE 14 33 … … 16 35 AC_CONFIG_HEADER([config.h]) 17 36 18 19 # Checks for programs. 37 ######################### 38 ## Checks for programs ## 39 ######################### 20 40 AC_PROG_CXX 21 41 AC_HEADER_STDC 22 42 23 ### CHECKING OPTIONAT ARGUMENTS 24 ## DEBUG-statement 43 ################################## 44 ## CHECKING OPTIONAL ARGUMENTS ## 45 ################################## 46 47 #-----------------# 48 # DEBUG-statement # 49 #-----------------# 25 50 DEBUG=no 26 51 AC_MSG_CHECKING([if DEBUG-mode should be enabled]) … … 29 54 DEBUG=$enableval) 30 55 31 if test "$DEBUG" = "no"; then56 if test x$DEBUG = xno; then 32 57 echo "no" 33 echo " -> Setting debuglevel to 1. Like this you can still see errors."34 DEBUG= 135 elif test "$DEBUG" =yes; then58 echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed." 59 DEBUG=3 60 elif test x$DEBUG = xyes; then 36 61 echo "yes" 37 echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!."38 DEBUG= 362 echo " -> Setting debuglevel to 4. HARD DEBUG MODE!!." 63 DEBUG=4 39 64 else 40 echo "yes setto $DEBUG"65 echo "yes: setting debuglevel to to $DEBUG" 41 66 fi 42 67 AC_DEFINE_UNQUOTED(DEBUG, $DEBUG, [in which debug mode we are]) … … 44 69 AC_SUBST(DEBUG) 45 70 46 ## GTK-disabled 71 #--------------# 72 # GTK-disabled # 73 #--------------# 47 74 AC_MSG_CHECKING([if gtk should be enabled]) 48 75 AC_ARG_WITH([gtk], 49 76 AC_HELP_STRING( [--without-gtk], 50 77 [Prevents GTK from being loaded]), [def_gtk=no], [def_gtk=yes]) 51 if test "$def_gtk" =yes; then78 if test x$def_gtk = xyes; then 52 79 echo "yes" 53 80 fi 54 if test "$def_gtk" =no; then81 if test x$def_gtk = xno; then 55 82 echo "no" 56 83 fi 57 84 58 ## gThread-disabled 85 #------------------# 86 # gThread-disabled # 87 #------------------# 59 88 AC_MSG_CHECKING([if gThread should be enabled]) 60 89 AC_ARG_WITH([gthread], 61 AC_HELP_STRING( [--without-gthread], 90 AC_HELP_STRING( [--without-gthread], 62 91 [Prevents gThread from being loaded]), [def_gthread=no], [def_gthread=yes]) 63 if test "$def_gthread" =yes; then92 if test x$def_gthread = xyes; then 64 93 echo "yes" 65 94 fi 66 if test "$def_gthread" =no; then95 if test x$def_gthread = xno; then 67 96 echo "no" 68 97 fi 69 98 70 ## pthread-disabled 99 #------------------# 100 # pthread-disabled # 101 #------------------# 71 102 AC_MSG_CHECKING([if pthread should be enabled]) 72 103 AC_ARG_WITH([pthread], 73 104 AC_HELP_STRING( [--without-pthread], 74 105 [Prevents pthread from being loaded]), [def_pthread=no], [def_pthread=yes]) 75 if test "$def_pthread" =yes; then106 if test x$def_pthread = xyes; then 76 107 echo "yes" 77 108 fi 78 if test "$def_pthread" =no; then109 if test x$def_pthread = xno; then 79 110 echo "no" 80 111 fi 81 112 82 ## libCurl disabled? 113 #------------------# 114 # libCurl-disabled # 115 #------------------# 83 116 AC_MSG_CHECKING([if libcURL should be enabled]) 84 117 AC_ARG_WITH([curl], 85 118 AC_HELP_STRING( [--without-curl], 86 119 [Prevents libcURL from being loaded]), [def_curl=no], [def_curl=yes]) 87 if test "$def_curl" =yes; then120 if test x$def_curl = xyes; then 88 121 echo "yes" 89 122 fi 90 if test "$def_curl" =no; then123 if test x$def_curl = xno; then 91 124 echo "no" 92 125 fi 93 126 94 ### SDL_image-disable 127 #-------------------# 128 # SDL_image-disable # 129 #-------------------# 95 130 def_sdl_image=yes 96 131 AC_MSG_CHECKING([if SDL_image should be enabled]) … … 98 133 AC_HELP_STRING( [--without-sdl-image], 99 134 [Prevents SDL_image from being loaded]), [def_sdl_image=no]) 100 if test "$def_sdl_image" =yes; then135 if test x$def_sdl_image = xyes; then 101 136 echo "yes" 102 137 fi 103 if test "$def_sdl_image" =no; then138 if test x$def_sdl_image = xno; then 104 139 echo "no" 105 140 fi 106 107 108 # ## SubProject-enable109 def_s dl_image=yes141 #-------------------# 142 # SubProject-enable # 143 #-------------------# 144 def_sub_projects=no 110 145 AC_MSG_CHECKING([if the SubProjects should be built]) 111 146 AC_ARG_ENABLE([sub-projects], 112 147 AC_HELP_STRING( [--enable-sub-projects], 113 [also builds the subProjects by default]), [def_sub_projects=yes])114 if test "$def_sub_projects" = yes; then148 [also builds the subProjects while make from srcdir]), [def_sub_projects=yes]) 149 if test x$def_sub_projects = xyes; then 115 150 echo "yes" 116 151 fi 117 if test "$def_sub_projects" = no; then152 if test x$def_sub_projects = xno; then 118 153 echo "no" 119 154 fi 120 155 AM_CONDITIONAL(SUB_PROJECTS, test x$def_sub_projects = xyes) 121 156 122 ## PROGRAMM CHECKING 123 # checking for Doxygen 157 ####################### 158 ## PROGRAMM CHECKING ## 159 ## 3. party Programs ## 160 ####################### 161 162 #----------------------# 163 # checking for Doxygen # 164 #----------------------# 124 165 AC_PATH_PROG(DOXYGEN, doxygen) 125 166 AM_CONDITIONAL(DOXYGEN, test $DOXYGEN) 126 167 127 ### CHECKING FOR SYSTEM ### 168 ######################### 169 ## CHECKING FOR SYSTEM ## 170 ######################### 171 ## here the system is checked, and openGL is included 172 ## also checking for SDL on differen Systems 128 173 129 174 AC_MSG_CHECKING([for System]) 130 175 ## checking for openGL-environment and other sys-specific parameters 131 176 case "$target" in 132 ### WINDOWS ### 177 #---------# 178 # WINDOWS # 179 #---------# 133 180 *-*-mingw32*) 134 181 echo "mingw-WINDOWS detected" … … 146 193 # checking for Windows openGl library 147 194 AC_CHECK_LIB([opengl32], [main], FOUND_opengl32=yes, "gl/gl.h") 148 if test "$FOUND_opengl32" = "yes"; then195 if test x$FOUND_opengl32 = xyes ; then 149 196 LIBS="$LIBS -lopengl32" 150 197 else … … 157 204 158 205 # cheking for GLU-header 159 AC_CHECK_HEADERS( GL/glu.h,,206 AC_CHECK_HEADERS([GL/glu.h] ,, 160 207 [AC_MSG_ERROR([cannot find opengl headers]) ]) 161 208 162 209 # checking for libGLU 163 210 AC_CHECK_LIB([glu32], [main], FOUND_glu32=yes) 164 if test "$FOUND_glu32" = "yes"; then211 if test x$FOUND_glu32 = xyes ; then 165 212 LIBS="$LIBS -lGLU32" 166 213 else … … 174 221 # checking for mingw32 175 222 AC_CHECK_LIB([mingw32], [main], FOUND_mingw32=yes) 176 if test $FOUND_mingw32 = "yes"; then223 if test x$FOUND_mingw32 = xyes; then 177 224 LIBS="$LIBS -lmingw32" 178 225 fi 179 226 # checking for SDL-headers 180 AC_CHECK_HEADERS( SDL/SDL.h,,227 AC_CHECK_HEADERS([SDL/SDL.h] ,, 181 228 [AC_MSG_ERROR([cannot find SDL headers]) ]) 182 229 183 230 #checking for libSDL 184 231 AC_CHECK_LIB([sdlmain], [main], FOUND_sdlmain=yes) 185 if test "$FOUND_sdlmain" = "yes"; then232 if test x$FOUND_sdlmain = xyes ; then 186 233 LIBS="$LIBS -lsdlmain" 187 234 else … … 193 240 fi 194 241 AC_CHECK_LIB([sdl], [main], FOUND_sdl=yes) 195 if test "$FOUND_sdl" = "yes"; then242 if test x$FOUND_sdl = xyes ; then 196 243 LIBS="$LIBS -lsdl" 197 244 else … … 204 251 205 252 ;; 206 207 ### LINUX ### 253 #-------# 254 # LINUX # 255 #-------# 208 256 *-*-linux*) 209 257 echo "Linux detected" … … 214 262 LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS" 215 263 # checking gl header 216 AC_CHECK_HEADERS( GL/gl.h,,264 AC_CHECK_HEADERS([GL/gl.h] ,, 217 265 [AC_MSG_ERROR([cannot find opengl headers]) ]) 218 266 219 267 # checking for Unix GL 220 268 AC_CHECK_LIB([GL], [glLoadIdentity], FOUND_GL=yes) 221 if test "$FOUND_GL" = "yes"; then269 if test x$FOUND_GL = xyes ; then 222 270 LIBS="$LIBS -lGL" 223 271 else … … 230 278 231 279 # cheking for GLU-header 232 AC_CHECK_HEADERS( GL/glu.h,,280 AC_CHECK_HEADERS([GL/glu.h] ,, 233 281 [AC_MSG_ERROR([cannot find opengl headers]) ]) 234 282 235 283 AC_CHECK_LIB([GLU], [gluProject], FOUND_GLU=yes) 236 if test "$FOUND_GLU" = "yes"; then284 if test x$FOUND_GLU = xyes ; then 237 285 LIBS="$LIBS -lGLU" 238 286 else … … 245 293 246 294 # checking for SDL-headers 247 AC_CHECK_HEADERS( SDL/SDL.h,,295 AC_CHECK_HEADERS([SDL/SDL.h] ,, 248 296 [AC_MSG_ERROR([cannot find SDL headers]) ]) 249 297 250 298 # checking for SDL-lib 251 299 AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes) 252 if test "$FOUND_SDL" = "yes"; then300 if test x$FOUND_SDL = xyes ; then 253 301 LIBS="$LIBS -lSDL" 254 302 else … … 270 318 # LIBS="$LIBS $SDL_LIBS" 271 319 ;; 272 273 ### OS X ### 320 #-----------# 321 # MAC -OS X # 322 #-----------# 274 323 *darwin*) 275 echo "OS X detected"324 echo "OS X detected" 276 325 277 326 osX="yes" … … 279 328 CPPFLAGS="-I/sw/include $CPPFLAGS" 280 329 # checking gl header 281 AC_CHECK_HEADERS( OpenGL/gl.h,,330 AC_CHECK_HEADERS([OpenGL/gl.h] ,, 282 331 [AC_MSG_ERROR([cannot find opengl headers]) ]) 283 332 # cheking for GLU-header 284 AC_CHECK_HEADERS( OpenGL/glu.h,,333 AC_CHECK_HEADERS([OpenGL/glu.h] ,, 285 334 [AC_MSG_ERROR([cannot find opengl headers]) ]) 286 335 287 336 LIBS="$LIBS -framework OpenGL" 337 338 SDL_CFLAGS=`sdl-config --cflags` 339 SDL_LIBS=`sdl-config --libs` 340 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" 341 LIBS="$LIBS $SDL_LIBS" 342 288 343 289 344 # checking for SDL-headers … … 298 353 # ) 299 354 300 SDL_CFLAGS=`sdl-config --cflags`301 SDL_LIBS=`sdl-config --libs`302 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"303 LIBS="$LIBS $SDL_LIBS"304 355 305 356 ;; … … 311 362 AC_SUBST(MSBITFIELDS) 312 363 313 ## check for SDL_Image 314 if test "$def_sdl_image" = "yes"; then 364 ################################### 365 ## CHECKING FOR HEADERS AND LIBS ## 366 ################################### 367 368 #-----------# 369 # SDL_Image # 370 #-----------# 371 if test x$def_sdl_image = xyes; then 315 372 # checking for SDL_image-headers 316 AC_CHECK_HEADERS( SDL/SDL_image.h,,373 AC_CHECK_HEADERS([SDL/SDL_image.h] ,, 317 374 [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ]) 318 375 fi 319 if test "$def_sdl_image" = "yes"; then376 if test x$def_sdl_image = xyes; then 320 377 # checking for SDL_image-lib 321 AC_CHECK_LIB([SDL_image], [main], FOUND_SDL_image=yes)322 if test "$FOUND_SDL_image" = "yes"; then378 AC_CHECK_LIB([SDL_image], [main], [FOUND_SDL_image=yes]) 379 if test x$FOUND_SDL_image = xyes ; then 323 380 LIBS="$LIBS -lSDL_image" 324 381 else … … 331 388 fi 332 389 333 334 if test "$def_sdl_image" = "no"; then 335 ## checking for libjpeg 336 AC_CHECK_HEADERS(jpeglib.h ,jpegHeader="yes", 337 jpegHeader="no") 338 if test $jpegHeader = "no"; then 390 ## case no SDL-image: 391 if test x$def_sdl_image = xno; then 392 #---------# 393 # libjpeg # 394 #---------# 395 AC_CHECK_HEADERS([jpeglib.h], [jpegHeader="yes"], 396 [jpegHeader="no"]) 397 if test xjpegHeader = xno; then 339 398 echo " not including jpeg." 340 399 else 341 AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)342 if test "$FOUND_jpeg" = "yes"; then400 AC_CHECK_LIB([jpeg], [main], [FOUND_jpeg=yes]) 401 if test x$FOUND_jpeg = xyes ; then 343 402 LIBS="$LIBS -ljpeg" 344 403 else … … 351 410 fi 352 411 353 ## checking for libpng 354 AC_CHECK_HEADERS(png.h ,pngHeader="yes", 355 pngHeader="no") 356 if test $pngHeader = "no"; then 412 #--------# 413 # libpng # 414 #--------# 415 AC_CHECK_HEADERS([png.h], [pngHeader="yes"], 416 [pngHeader="no"]) 417 if test x$pngHeader = xno; then 357 418 echo " not including png." 358 419 else 359 420 AC_CHECK_LIB([png], [main], FOUND_png=yes) 360 if test "$FOUND_png" = "yes"; then421 if test x$FOUND_png = xyes ; then 361 422 LIBS="$LIBS -lpng" 362 423 else … … 370 431 fi 371 432 372 ## checking for GTK 373 if test "$def_gtk" = yes; then 433 #-----# 434 # GTK # 435 #-----# 436 if test x$def_gtk = xyes; then 374 437 375 438 #PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no) … … 390 453 AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes) 391 454 392 ## checking for gThread 393 if test "$def_gthread" = yes; then 455 #---------# 456 # gThread # 457 #---------# 458 if test x$def_gthread = xyes; then 394 459 395 460 AC_MSG_CHECKING([for gthread]) … … 409 474 AM_CONDITIONAL(HAVE_GTHREAD, test x$have_gthread = xyes) 410 475 411 ## checking for libcURL 412 if test "$def_curl" = yes; then 413 414 AC_CHECK_HEADERS([curl/curl.h], curlHeader="yes", curlHeader="no") 476 #---------# 477 # libcURL # 478 #---------# 479 if test x$def_curl = xyes; then 480 481 AC_CHECK_HEADERS([curl/curl.h], [curlHeader="yes"], [curlHeader="no"]) 415 482 AC_CHECK_LIB([curl], [main], [FOUND_curl=yes]) 416 483 if test x$curlHeader = xyes & test x$FOUND_curl = xyes ; then … … 419 486 CURLCFLAGS=`curl-config --cflags` 420 487 AC_DEFINE_UNQUOTED(HAVE_CURL, 1, [if we have CURL]) 421 else 488 else 422 489 have_curl=no 423 490 fi … … 428 495 AM_CONDITIONAL(HAVE_CURL, test x$have_curl = xyes) 429 496 430 431 ##checking for pthread 497 #---------# 498 # pthread # 499 #---------# 432 500 if test x$def_pthread = xyes ; then 433 501 if test x$have_gthread = xyes ; then 434 AC_CHECK_HEADERS([pthread.h], pthreadHeader="yes", pthreadHeader="no")435 AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)436 if test "$FOUND_pthread" = "yes"; then502 AC_CHECK_HEADERS([pthread.h], [pthreadHeader="yes"], [pthreadHeader="no"]) 503 AC_CHECK_LIB([pthread], [main], [FOUND_pthread=yes]) 504 if test x$FOUND_pthread = xyes ; then 437 505 LIBS="$LIBS -lpthread" 438 506 fi 439 507 fi 440 508 fi 509 510 441 511 # FIXME: Replace `main' with a function in `-lm': 442 512 AC_CHECK_LIB([m], [main]) … … 454 524 AC_CHECK_FUNCS([bzero sqrt]) 455 525 526 ###################### 527 ## OUTPUT CONFIGURE ## 528 ###################### 456 529 AC_CONFIG_FILES([Makefile 457 530 src/Makefile -
orxonox/trunk/src/Makefile.in
r3423 r3424 318 318 esac; \ 319 319 done; \ 320 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/Makefile'; \320 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ 321 321 cd $(top_srcdir) && \ 322 $(AUTOMAKE) -- gnusrc/Makefile322 $(AUTOMAKE) --foreign src/Makefile 323 323 .PRECIOUS: Makefile 324 324 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/console/Makefile.in
r3423 r3424 203 203 esac; \ 204 204 done; \ 205 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/console/Makefile'; \205 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/console/Makefile'; \ 206 206 cd $(top_srcdir) && \ 207 $(AUTOMAKE) -- gnusrc/console/Makefile207 $(AUTOMAKE) --foreign src/console/Makefile 208 208 .PRECIOUS: Makefile 209 209 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/gui/Makefile.in
r3423 r3424 234 234 esac; \ 235 235 done; \ 236 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/gui/Makefile'; \236 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gui/Makefile'; \ 237 237 cd $(top_srcdir) && \ 238 $(AUTOMAKE) -- gnusrc/gui/Makefile238 $(AUTOMAKE) --foreign src/gui/Makefile 239 239 .PRECIOUS: Makefile 240 240 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -
orxonox/trunk/src/importer/Makefile.in
r3423 r3424 215 215 esac; \ 216 216 done; \ 217 echo ' cd $(top_srcdir) && $(AUTOMAKE) -- gnusrc/importer/Makefile'; \217 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/importer/Makefile'; \ 218 218 cd $(top_srcdir) && \ 219 $(AUTOMAKE) -- gnusrc/importer/Makefile219 $(AUTOMAKE) --foreign src/importer/Makefile 220 220 .PRECIOUS: Makefile 221 221 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset
for help on using the changeset viewer.
