Changeset 5221 in orxonox.OLD
- Timestamp:
- Sep 23, 2005, 5:05:39 PM (19 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure
r5160 r5221 879 879 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 880 880 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 881 --with-shared-lib-path Tells the executable, where to look for the shared 882 libraries. 881 883 --with-sub-projects also builds the subProjects while make from srcdir 882 884 … … 3948 3950 3949 3951 #-----------------# 3952 # shared-lib-path # 3953 #-----------------# 3954 SHARED_LIB_PATH=no 3955 echo "$as_me:$LINENO: checking shared lib path" >&5 3956 echo $ECHO_N "checking shared lib path... $ECHO_C" >&6 3957 3958 # Check whether --with-shared-lib-path or --without-shared-lib-path was given. 3959 if test "${with_shared_lib_path+set}" = set; then 3960 withval="$with_shared_lib_path" 3961 SHARED_LIB_PATH=$enableval 3962 fi; 3963 3964 if test x$SHARED_LIB_PATH = xno; then 3965 echo "no" 3966 else 3967 echo $SHARED_LIB_PATH 3968 fi 3969 3970 3971 #-----------------# 3950 3972 # DEBUG-statement # 3951 3973 #-----------------# … … 4375 4397 4376 4398 #-----------# 4377 # SDL 4399 # SDL(win) # 4378 4400 #-----------# 4379 4401 # checking for SDL-headers … … 5517 5539 Linux="yes" 5518 5540 5519 CPPFLAGS="-I/usr/X11R6/include -I/usr/include" 5520 ##LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS" 5541 CPPFLAGS="-I/usr/include" 5542 if test x$SHARED_LIB_PATH != xno; then 5543 echo "setting new LDFlAGS with $SHARED_LIB_PATH" 5544 LDFLAGS="-Wl,-rpath,$SHARED_LIB_PATH $LDFLAGS" 5545 fi 5546 LDFLAGS="-L/usr/lib" 5547 ## LDFLAGS="-L/usr/lib -L$HOME/tmp/lib $LDFLAGS" 5548 5521 5549 # checking gl header 5522 5550 … … 5676 5704 5677 5705 # checking for Unix GL 5678 echo "$as_me:$LINENO: checking for glLoadIdentityin -lGL" >&55679 echo $ECHO_N "checking for glLoadIdentityin -lGL... $ECHO_C" >&65680 if test "${ac_cv_lib_GL_ glLoadIdentity+set}" = set; then5706 echo "$as_me:$LINENO: checking for main in -lGL" >&5 5707 echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6 5708 if test "${ac_cv_lib_GL_main+set}" = set; then 5681 5709 echo $ECHO_N "(cached) $ECHO_C" >&6 5682 5710 else … … 5690 5718 /* end confdefs.h. */ 5691 5719 5692 /* Override any gcc2 internal prototype to avoid an error. */ 5693 #ifdef __cplusplus 5694 extern "C" 5695 #endif 5696 /* We use char because int might match the return type of a gcc2 5697 builtin and then its argument prototype would still apply. */ 5698 char glLoadIdentity (); 5720 5699 5721 int 5700 5722 main () 5701 5723 { 5702 glLoadIdentity();5724 main (); 5703 5725 ; 5704 5726 return 0; … … 5727 5749 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5728 5750 (exit $ac_status); }; }; then 5729 ac_cv_lib_GL_ glLoadIdentity=yes5751 ac_cv_lib_GL_main=yes 5730 5752 else 5731 5753 echo "$as_me: failed program was:" >&5 5732 5754 sed 's/^/| /' conftest.$ac_ext >&5 5733 5755 5734 ac_cv_lib_GL_ glLoadIdentity=no5756 ac_cv_lib_GL_main=no 5735 5757 fi 5736 5758 rm -f conftest.err conftest.$ac_objext \ … … 5738 5760 LIBS=$ac_check_lib_save_LIBS 5739 5761 fi 5740 echo "$as_me:$LINENO: result: $ac_cv_lib_GL_ glLoadIdentity" >&55741 echo "${ECHO_T}$ac_cv_lib_GL_ glLoadIdentity" >&65742 if test $ac_cv_lib_GL_ glLoadIdentity= yes; then5762 echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 5763 echo "${ECHO_T}$ac_cv_lib_GL_main" >&6 5764 if test $ac_cv_lib_GL_main = yes; then 5743 5765 FOUND_GL=yes 5744 5766 fi … … 5910 5932 5911 5933 5912 echo "$as_me:$LINENO: checking for gluProjectin -lGLU" >&55913 echo $ECHO_N "checking for gluProjectin -lGLU... $ECHO_C" >&65914 if test "${ac_cv_lib_GLU_ gluProject+set}" = set; then5934 echo "$as_me:$LINENO: checking for main in -lGLU" >&5 5935 echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6 5936 if test "${ac_cv_lib_GLU_main+set}" = set; then 5915 5937 echo $ECHO_N "(cached) $ECHO_C" >&6 5916 5938 else … … 5924 5946 /* end confdefs.h. */ 5925 5947 5926 /* Override any gcc2 internal prototype to avoid an error. */ 5927 #ifdef __cplusplus 5928 extern "C" 5929 #endif 5930 /* We use char because int might match the return type of a gcc2 5931 builtin and then its argument prototype would still apply. */ 5932 char gluProject (); 5948 5933 5949 int 5934 5950 main () 5935 5951 { 5936 gluProject();5952 main (); 5937 5953 ; 5938 5954 return 0; … … 5961 5977 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5962 5978 (exit $ac_status); }; }; then 5963 ac_cv_lib_GLU_ gluProject=yes5979 ac_cv_lib_GLU_main=yes 5964 5980 else 5965 5981 echo "$as_me: failed program was:" >&5 5966 5982 sed 's/^/| /' conftest.$ac_ext >&5 5967 5983 5968 ac_cv_lib_GLU_ gluProject=no5984 ac_cv_lib_GLU_main=no 5969 5985 fi 5970 5986 rm -f conftest.err conftest.$ac_objext \ … … 5972 5988 LIBS=$ac_check_lib_save_LIBS 5973 5989 fi 5974 echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_ gluProject" >&55975 echo "${ECHO_T}$ac_cv_lib_GLU_ gluProject" >&65976 if test $ac_cv_lib_GLU_ gluProject= yes; then5990 echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5 5991 echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6 5992 if test $ac_cv_lib_GLU_main = yes; then 5977 5993 FOUND_GLU=yes 5978 5994 fi … … 6218 6234 exit -1 6219 6235 fi 6236 # checking for alut 6237 # AC_CHECK_LIB([alut], [main], [FOUND_openal=yes]) 6238 # if test x$FOUND_openal = xyes ; then 6239 # LIBS="$LIBS -lalut" 6240 # fi 6220 6241 6221 6242 # checking for SDL … … 6225 6246 echo $SDL_VERSION 6226 6247 6227 CPPFLAGS="`sdl-config --cflags` $CPPFLAGS"6228 6248 6229 6249 for ac_header in SDL.h … … 6531 6551 done 6532 6552 6533 6534 LIBS="`sdl-config --libs` $LIBS" 6553 CPPFLAGS="`sdl-config --cflags` $CPPFLAGS" 6554 echo "$as_me:$LINENO: checking for main in -lSDL" >&5 6555 echo $ECHO_N "checking for main in -lSDL... $ECHO_C" >&6 6556 if test "${ac_cv_lib_SDL_main+set}" = set; then 6557 echo $ECHO_N "(cached) $ECHO_C" >&6 6558 else 6559 ac_check_lib_save_LIBS=$LIBS 6560 LIBS="-lSDL $LIBS" 6561 cat >conftest.$ac_ext <<_ACEOF 6562 /* confdefs.h. */ 6563 _ACEOF 6564 cat confdefs.h >>conftest.$ac_ext 6565 cat >>conftest.$ac_ext <<_ACEOF 6566 /* end confdefs.h. */ 6567 6568 6569 int 6570 main () 6571 { 6572 main (); 6573 ; 6574 return 0; 6575 } 6576 _ACEOF 6577 rm -f conftest.$ac_objext conftest$ac_exeext 6578 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6579 (eval $ac_link) 2>conftest.er1 6580 ac_status=$? 6581 grep -v '^ *+' conftest.er1 >conftest.err 6582 rm -f conftest.er1 6583 cat conftest.err >&5 6584 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6585 (exit $ac_status); } && 6586 { ac_try='test -z "$ac_c_werror_flag" 6587 || test ! -s conftest.err' 6588 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6589 (eval $ac_try) 2>&5 6590 ac_status=$? 6591 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6592 (exit $ac_status); }; } && 6593 { ac_try='test -s conftest$ac_exeext' 6594 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6595 (eval $ac_try) 2>&5 6596 ac_status=$? 6597 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6598 (exit $ac_status); }; }; then 6599 ac_cv_lib_SDL_main=yes 6600 else 6601 echo "$as_me: failed program was:" >&5 6602 sed 's/^/| /' conftest.$ac_ext >&5 6603 6604 ac_cv_lib_SDL_main=no 6605 fi 6606 rm -f conftest.err conftest.$ac_objext \ 6607 conftest$ac_exeext conftest.$ac_ext 6608 LIBS=$ac_check_lib_save_LIBS 6609 fi 6610 echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_main" >&5 6611 echo "${ECHO_T}$ac_cv_lib_SDL_main" >&6 6612 if test $ac_cv_lib_SDL_main = yes; then 6613 FOUND_SDL=yes 6614 fi 6615 6616 if test x$FOUND_SDL = xyes ; then 6617 LIBS="`sdl-config --libs` $LIBS" 6618 else 6619 echo "------------------" 6620 echo "SDL library not found." 6621 echo "please install the SDL library, which can be found at http://www.libsdl.org" 6622 echo "------------------" 6623 exit -1 6624 fi 6625 6535 6626 ;; 6536 6627 … … 7278 7369 exit -1 7279 7370 fi 7280 7281 7371 7282 7372 #-----------# -
trunk/configure.ac
r5220 r5221 65 65 66 66 #-----------------# 67 # shared-lib-path # 68 #-----------------# 69 SHARED_LIB_PATH=no 70 AC_MSG_CHECKING([shared lib path]) 71 AC_ARG_WITH([shared-lib-path], 72 AC_HELP_STRING( [--with-shared-lib-path], [Tells the executable, where to look for the shared libraries.]), 73 SHARED_LIB_PATH=$enableval) 74 75 if test x$SHARED_LIB_PATH = xno; then 76 echo "no" 77 else 78 echo $SHARED_LIB_PATH 79 fi 80 81 82 #-----------------# 67 83 # DEBUG-statement # 68 84 #-----------------# … … 252 268 253 269 #-----------# 254 # SDL 270 # SDL(win) # 255 271 #-----------# 256 272 # checking for SDL-headers … … 346 362 Linux="yes" 347 363 348 CPPFLAGS="-I/usr/X11R6/include -I/usr/include -I$HOME/tmp/include" 349 LDFLAGS=" -Wl,-rpath,$HOME/tmp/lib -L/usr/lib -L$HOME/tmp/lib $LDFLAGS" 364 CPPFLAGS="-I/usr/include" 365 if test x$SHARED_LIB_PATH != xno; then 366 echo "setting new LDFlAGS with $SHARED_LIB_PATH" 367 LDFLAGS="-Wl,-rpath,$SHARED_LIB_PATH $LDFLAGS" 368 fi 369 LDFLAGS="-L/usr/lib" 370 ## LDFLAGS="-L/usr/lib -L$HOME/tmp/lib $LDFLAGS" 371 350 372 # checking gl header 351 373 AC_CHECK_HEADERS([GL/gl.h] ,, … … 368 390 [AC_MSG_ERROR([cannot find opengl headers]) ]) 369 391 370 #AC_CHECK_LIB([GLU], [main], FOUND_GLU=yes)371 #if test x$FOUND_GLU = xyes ; then392 AC_CHECK_LIB([GLU], [main], FOUND_GLU=yes) 393 if test x$FOUND_GLU = xyes ; then 372 394 LIBS="$LIBS -lGLU" 373 #else374 #echo "------------------"375 #echo "GLU library not found."376 #echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org"377 #echo "------------------"378 #exit -1379 #fi395 else 396 echo "------------------" 397 echo "GLU library not found." 398 echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org" 399 echo "------------------" 400 exit -1 401 fi 380 402 381 403 #--------# … … 397 419 fi 398 420 # checking for alut 399 AC_CHECK_LIB([alut], [main], [FOUND_openal=yes])400 if test x$FOUND_openal = xyes ; then401 LIBS="$LIBS -lalut"402 fi421 # AC_CHECK_LIB([alut], [main], [FOUND_openal=yes]) 422 # if test x$FOUND_openal = xyes ; then 423 # LIBS="$LIBS -lalut" 424 # fi 403 425 404 426 # checking for SDL … … 407 429 echo $SDL_VERSION 408 430 409 CPPFLAGS="`sdl-config --cflags` $CPPFLAGS"410 431 AC_CHECK_HEADERS([SDL.h] ,, 411 432 [AC_CHECK_HEADERS([SDL/SDL.h] ,,AC_MSG_ERROR([cannot find SDL header. please download from libsdl.org])])) 412 413 LIBS="`sdl-config --libs` $LIBS" 433 CPPFLAGS="`sdl-config --cflags` $CPPFLAGS" 434 AC_CHECK_LIB([SDL], [main], [FOUND_SDL=yes]) 435 if test x$FOUND_SDL = xyes ; then 436 LIBS="`sdl-config --libs` $LIBS" 437 else 438 echo "------------------" 439 echo "SDL library not found." 440 echo "please install the SDL library, which can be found at http://www.libsdl.org" 441 echo "------------------" 442 exit -1 443 fi 444 414 445 ;; 415 446 … … 483 514 exit -1 484 515 fi 485 486 516 487 517 #-----------#
Note: See TracChangeset
for help on using the changeset viewer.