Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5822 in orxonox.OLD for trunk/configure.ac


Ignore:
Timestamp:
Nov 29, 2005, 2:22:37 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/network to the trunk
merged with command:
svn merge -r 5505:HEAD branches/network trunk

conflicts resolved in favor of the trunk (as always :))
also fixed a typo in the #include "SDL_tread.h"

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r5750 r5822  
    585585      echo "------------------"
    586586      echo "SDL_image library not found."
    587       echo "please install the SDL_image library, which can be found at http://www.l ibsdl.org/projects/SDL_image/"
     587      echo "please install the SDL_image library, which can be found at http://www.libsdl.org/projects/SDL_image/"
    588588      echo "------------------"
    589589      exit -1
    590590   fi
     591
     592#---------#
     593# SDL_Net #
     594#---------#
     595# checking for SDL_net-headers
     596AC_CHECK_HEADERS([SDL_net.h] ,,
     597    [AC_CHECK_HEADERS([SDL/SDL_net.h],, AC_MSG_ERROR([SDL_net header not found.]))])
     598# checking for SDL_net-lib
     599AC_CHECK_LIB([SDL_net], [main], [FOUND_SDL_net=yes; LIBS="$LIBS -lSDL_net"])
     600   if test x$FOUND_SDL_net != xyes ; then
     601      echo "------------------"
     602      echo "SDL_net library not found."
     603      echo "please install the SDL_net library, which can be found at http://www.libsdl.org/projects/SDL_net/"
     604      echo "------------------"
     605      exit -1
     606   fi
     607
    591608
    592609#-----#
     
    722739                 src/lib/particles/Makefile
    723740                 src/lib/collision_detection/Makefile
     741                 src/lib/network/Makefile
    724742                 src/lib/shell/Makefile
    725743                 src/lib/gui/Makefile
     
    733751                 src/subprojects/particles/Makefile
    734752                 src/subprojects/collision_detection/Makefile
     753                 src/subprojects/network/Makefile
    735754                 ])
    736755
Note: See TracChangeset for help on using the changeset viewer.