Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5221 in orxonox.OLD


Ignore:
Timestamp:
Sep 23, 2005, 5:05:39 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: configure.ac path, so now one can append a path for the shared-lib's dir

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure

    r5160 r5221  
    879879  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    880880  --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.
    881883  --with-sub-projects     also builds the subProjects while make from srcdir
    882884
    … …  
    39483950
    39493951#-----------------#
     3952# shared-lib-path #
     3953#-----------------#
     3954SHARED_LIB_PATH=no
     3955echo "$as_me:$LINENO: checking shared lib path" >&5
     3956echo $ECHO_N "checking shared lib path... $ECHO_C" >&6
     3957
     3958# Check whether --with-shared-lib-path or --without-shared-lib-path was given.
     3959if test "${with_shared_lib_path+set}" = set; then
     3960  withval="$with_shared_lib_path"
     3961  SHARED_LIB_PATH=$enableval
     3962fi;
     3963
     3964if test x$SHARED_LIB_PATH = xno; then
     3965        echo "no"
     3966else
     3967        echo $SHARED_LIB_PATH
     3968fi
     3969
     3970
     3971#-----------------#
    39503972# DEBUG-statement #
    39513973#-----------------#
    … …  
    43754397
    43764398#-----------#
    4377 # SDL (win) #
     4399# SDL(win) #
    43784400#-----------#
    43794401# checking for SDL-headers
    … …  
    55175539 Linux="yes"
    55185540
    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"
     5541CPPFLAGS="-I/usr/include"
     5542if test x$SHARED_LIB_PATH != xno; then
     5543        echo "setting new LDFlAGS with $SHARED_LIB_PATH"
     5544        LDFLAGS="-Wl,-rpath,$SHARED_LIB_PATH $LDFLAGS"
     5545fi
     5546LDFLAGS="-L/usr/lib"
     5547## LDFLAGS="-L/usr/lib -L$HOME/tmp/lib $LDFLAGS"
     5548
    55215549# checking gl header
    55225550
    … …  
    56765704
    56775705#  checking for Unix GL
    5678    echo "$as_me:$LINENO: checking for glLoadIdentity in -lGL" >&5
    5679 echo $ECHO_N "checking for glLoadIdentity in -lGL... $ECHO_C" >&6
    5680 if test "${ac_cv_lib_GL_glLoadIdentity+set}" = set; then
     5706   echo "$as_me:$LINENO: checking for main in -lGL" >&5
     5707echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6
     5708if test "${ac_cv_lib_GL_main+set}" = set; then
    56815709  echo $ECHO_N "(cached) $ECHO_C" >&6
    56825710else
    … …  
    56905718/* end confdefs.h.  */
    56915719
    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
    56995721int
    57005722main ()
    57015723{
    5702 glLoadIdentity ();
     5724main ();
    57035725  ;
    57045726  return 0;
    … …  
    57275749  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    57285750  (exit $ac_status); }; }; then
    5729   ac_cv_lib_GL_glLoadIdentity=yes
     5751  ac_cv_lib_GL_main=yes
    57305752else
    57315753  echo "$as_me: failed program was:" >&5
    57325754sed 's/^/| /' conftest.$ac_ext >&5
    57335755
    5734 ac_cv_lib_GL_glLoadIdentity=no
     5756ac_cv_lib_GL_main=no
    57355757fi
    57365758rm -f conftest.err conftest.$ac_objext \
    … …  
    57385760LIBS=$ac_check_lib_save_LIBS
    57395761fi
    5740 echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glLoadIdentity" >&5
    5741 echo "${ECHO_T}$ac_cv_lib_GL_glLoadIdentity" >&6
    5742 if test $ac_cv_lib_GL_glLoadIdentity = yes; then
     5762echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
     5763echo "${ECHO_T}$ac_cv_lib_GL_main" >&6
     5764if test $ac_cv_lib_GL_main = yes; then
    57435765  FOUND_GL=yes
    57445766fi
    … …  
    59105932
    59115933
    5912     echo "$as_me:$LINENO: checking for gluProject in -lGLU" >&5
    5913 echo $ECHO_N "checking for gluProject in -lGLU... $ECHO_C" >&6
    5914 if test "${ac_cv_lib_GLU_gluProject+set}" = set; then
     5934    echo "$as_me:$LINENO: checking for main in -lGLU" >&5
     5935echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6
     5936if test "${ac_cv_lib_GLU_main+set}" = set; then
    59155937  echo $ECHO_N "(cached) $ECHO_C" >&6
    59165938else
    … …  
    59245946/* end confdefs.h.  */
    59255947
    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
    59335949int
    59345950main ()
    59355951{
    5936 gluProject ();
     5952main ();
    59375953  ;
    59385954  return 0;
    … …  
    59615977  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    59625978  (exit $ac_status); }; }; then
    5963   ac_cv_lib_GLU_gluProject=yes
     5979  ac_cv_lib_GLU_main=yes
    59645980else
    59655981  echo "$as_me: failed program was:" >&5
    59665982sed 's/^/| /' conftest.$ac_ext >&5
    59675983
    5968 ac_cv_lib_GLU_gluProject=no
     5984ac_cv_lib_GLU_main=no
    59695985fi
    59705986rm -f conftest.err conftest.$ac_objext \
    … …  
    59725988LIBS=$ac_check_lib_save_LIBS
    59735989fi
    5974 echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluProject" >&5
    5975 echo "${ECHO_T}$ac_cv_lib_GLU_gluProject" >&6
    5976 if test $ac_cv_lib_GLU_gluProject = yes; then
     5990echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5
     5991echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6
     5992if test $ac_cv_lib_GLU_main = yes; then
    59775993  FOUND_GLU=yes
    59785994fi
    … …  
    62186234        exit -1
    62196235     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
    62206241
    62216242# checking for SDL
    … …  
    62256246  echo $SDL_VERSION
    62266247
    6227    CPPFLAGS="`sdl-config --cflags` $CPPFLAGS"
    62286248
    62296249for ac_header in SDL.h
    … …  
    65316551done
    65326552
    6533 
    6534    LIBS="`sdl-config --libs` $LIBS"
     6553   CPPFLAGS="`sdl-config --cflags` $CPPFLAGS"
     6554   echo "$as_me:$LINENO: checking for main in -lSDL" >&5
     6555echo $ECHO_N "checking for main in -lSDL... $ECHO_C" >&6
     6556if test "${ac_cv_lib_SDL_main+set}" = set; then
     6557  echo $ECHO_N "(cached) $ECHO_C" >&6
     6558else
     6559  ac_check_lib_save_LIBS=$LIBS
     6560LIBS="-lSDL  $LIBS"
     6561cat >conftest.$ac_ext <<_ACEOF
     6562/* confdefs.h.  */
     6563_ACEOF
     6564cat confdefs.h >>conftest.$ac_ext
     6565cat >>conftest.$ac_ext <<_ACEOF
     6566/* end confdefs.h.  */
     6567
     6568
     6569int
     6570main ()
     6571{
     6572main ();
     6573  ;
     6574  return 0;
     6575}
     6576_ACEOF
     6577rm -f conftest.$ac_objext conftest$ac_exeext
     6578if { (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
     6600else
     6601  echo "$as_me: failed program was:" >&5
     6602sed 's/^/| /' conftest.$ac_ext >&5
     6603
     6604ac_cv_lib_SDL_main=no
     6605fi
     6606rm -f conftest.err conftest.$ac_objext \
     6607      conftest$ac_exeext conftest.$ac_ext
     6608LIBS=$ac_check_lib_save_LIBS
     6609fi
     6610echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_main" >&5
     6611echo "${ECHO_T}$ac_cv_lib_SDL_main" >&6
     6612if test $ac_cv_lib_SDL_main = yes; then
     6613  FOUND_SDL=yes
     6614fi
     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
    65356626    ;;
    65366627
    … …  
    72787369        exit -1
    72797370     fi
    7280 
    72817371
    72827372#-----------#

  • trunk/configure.ac

    r5220 r5221  
    6565
    6666#-----------------#
     67# shared-lib-path #
     68#-----------------#
     69SHARED_LIB_PATH=no
     70AC_MSG_CHECKING([shared lib path])
     71AC_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
     75if test x$SHARED_LIB_PATH = xno; then
     76        echo "no"
     77else
     78        echo $SHARED_LIB_PATH
     79fi
     80
     81
     82#-----------------#
    6783# DEBUG-statement #
    6884#-----------------#
    … …  
    252268
    253269#-----------#
    254 # SDL (win) #
     270# SDL(win) #
    255271#-----------#
    256272# checking for SDL-headers
    … …  
    346362 Linux="yes"
    347363
    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"
     364CPPFLAGS="-I/usr/include"
     365if test x$SHARED_LIB_PATH != xno; then
     366        echo "setting new LDFlAGS with $SHARED_LIB_PATH"
     367        LDFLAGS="-Wl,-rpath,$SHARED_LIB_PATH $LDFLAGS"
     368fi
     369LDFLAGS="-L/usr/lib"
     370## LDFLAGS="-L/usr/lib -L$HOME/tmp/lib $LDFLAGS"
     371
    350372# checking gl header
    351373   AC_CHECK_HEADERS([GL/gl.h] ,,
    … …  
    368390      [AC_MSG_ERROR([cannot find opengl headers]) ])
    369391
    370 #    AC_CHECK_LIB([GLU], [main], FOUND_GLU=yes)
    371 #    if test x$FOUND_GLU = xyes ; then
     392    AC_CHECK_LIB([GLU], [main], FOUND_GLU=yes)
     393    if test x$FOUND_GLU = xyes ; then
    372394      LIBS="$LIBS -lGLU"
    373 #    else
    374 #         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 -1
    379 #    fi
     395    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
    380402
    381403#--------#
    … …  
    397419     fi
    398420# checking for alut
    399   AC_CHECK_LIB([alut], [main], [FOUND_openal=yes])
    400      if test x$FOUND_openal = xyes ; then
    401        LIBS="$LIBS -lalut"
    402      fi
     421#  AC_CHECK_LIB([alut], [main], [FOUND_openal=yes])
     422#     if test x$FOUND_openal = xyes ; then
     423#       LIBS="$LIBS -lalut"
     424#     fi
    403425
    404426# checking for SDL
    … …  
    407429  echo $SDL_VERSION
    408430
    409    CPPFLAGS="`sdl-config --cflags` $CPPFLAGS"
    410431   AC_CHECK_HEADERS([SDL.h] ,,
    411432      [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
    414445    ;;
    415446
    … …  
    483514        exit -1
    484515     fi
    485 
    486516
    487517#-----------#
Note: See TracChangeset for help on using the changeset viewer.