*** configure.orig Sun Mar 6 18:18:01 2005
--- configure Wed Jul 6 13:49:08 2005
***************
*** 8878,8884 ****
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
! LIBS="-lSDL `sdl-config --libs` $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
--- 8878,8884 ----
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
! LIBS="-lSDL `sdl11-config --libs` $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
***************
*** 8928,8934 ****
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
! ac_cv_lib_SDL_SDL_Init=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
--- 8928,8934 ----
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
! ac_cv_lib_SDL_SDL_Init=yes
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
***************
*** 8937,8947 ****
echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5
echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6
if test $ac_cv_lib_SDL_SDL_Init = yes; then
! CXXFLAGS="$CXXFLAGS `sdl-config --cflags`"
! CPPFLAGS="$CPPFLAGS `sdl-config --cflags`"
export CPPFLAGS
export CXXFLAGS
! for LIBRARY in `sdl-config --libs`; do
echo "$LIBRARY" | grep "^-l" > /dev/null && LIBS="$LIBRARY $LIBS"
done
export LIBS
--- 8937,8947 ----
echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5
echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6
if test $ac_cv_lib_SDL_SDL_Init = yes; then
! CXXFLAGS="$CXXFLAGS `sdl11-config --cflags`"
! CPPFLAGS="$CPPFLAGS `sdl11-config --cflags`"
export CPPFLAGS
export CXXFLAGS
! for LIBRARY in `sdl11-config --libs`; do
echo "$LIBRARY" | grep "^-l" > /dev/null && LIBS="$LIBRARY $LIBS"
done
export LIBS
***************
*** 9041,9047 ****
fi
! if test "`sdl-config --libs | grep windows`" ; then
echo "$as_me:$LINENO: checking for main in -lwsock32" >&5
echo $ECHO_N "checking for main in -lwsock32... $ECHO_C" >&6
--- 9041,9047 ----
fi
! if test "`sdl11-config --libs | grep windows`" ; then
echo "$as_me:$LINENO: checking for main in -lwsock32" >&5
echo $ECHO_N "checking for main in -lwsock32... $ECHO_C" >&6
***************
*** 9182,9188 ****
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
! if test `eval echo '${'$as_ac_Lib'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_LIB$SYS_GL_LIB" | $as_tr_cpp` 1
_ACEOF
--- 9182,9188 ----
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
! if test `eval echo '${'$as_ac_Lib'}'` = no; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_LIB$SYS_GL_LIB" | $as_tr_cpp` 1
_ACEOF
***************
*** 9250,9256 ****
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_X11_main" >&5
echo "${ECHO_T}$ac_cv_lib_X11_main" >&6
! if test $ac_cv_lib_X11_main = yes; then
LIBS="-lX11 -L/usr/X11R6/lib $LIBS"
export LIBS
cat >>confdefs.h <<\_ACEOF
--- 9250,9256 ----
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_X11_main" >&5
echo "${ECHO_T}$ac_cv_lib_X11_main" >&6
! if test $ac_cv_lib_X11_main = no; then
LIBS="-lX11 -L/usr/X11R6/lib $LIBS"
export LIBS
cat >>confdefs.h <<\_ACEOF
***************
*** 9677,9683 ****
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
! if test `eval echo '${'$as_ac_Lib'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_LIB$SYS_GLU_LIB" | $as_tr_cpp` 1
_ACEOF
--- 9677,9683 ----
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
! if test `eval echo '${'$as_ac_Lib'}'` = no; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_LIB$SYS_GLU_LIB" | $as_tr_cpp` 1
_ACEOF
***************
*** 9758,9764 ****
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_z_main" >&5
echo "${ECHO_T}$ac_cv_lib_z_main" >&6
! if test $ac_cv_lib_z_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
--- 9758,9764 ----
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_z_main" >&5
echo "${ECHO_T}$ac_cv_lib_z_main" >&6
! if test $ac_cv_lib_z_main = no; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
***************
*** 9831,9837 ****
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
echo "${ECHO_T}$ac_cv_lib_png_main" >&6
! if test $ac_cv_lib_png_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPNG 1
_ACEOF
--- 9831,9837 ----
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
echo "${ECHO_T}$ac_cv_lib_png_main" >&6
! if test $ac_cv_lib_png_main = no; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPNG 1
_ACEOF
***************
*** 9904,9910 ****
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_main" >&5
echo "${ECHO_T}$ac_cv_lib_jpeg_main" >&6
! if test $ac_cv_lib_jpeg_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBJPEG 1
_ACEOF
--- 9904,9910 ----
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_main" >&5
echo "${ECHO_T}$ac_cv_lib_jpeg_main" >&6
! if test $ac_cv_lib_jpeg_main = no; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBJPEG 1
_ACEOF
***************
*** 9987,9993 ****
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
echo "${ECHO_T}$ac_cv_lib_SDL_image_IMG_Load" >&6
! if test $ac_cv_lib_SDL_image_IMG_Load = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSDL_IMAGE 1
_ACEOF
--- 9987,9993 ----
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
echo "${ECHO_T}$ac_cv_lib_SDL_image_IMG_Load" >&6
! if test $ac_cv_lib_SDL_image_IMG_Load = no; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSDL_IMAGE 1
_ACEOF
*** src/network/Makefile.in.orig Sat Feb 19 17:54:22 2005
--- src/network/Makefile.in Wed Jul 6 14:07:17 2005
***************
*** 38,44 ****
# *
#*********************************************************
! LIBS=@LIBS@
NETWORK=nServerInfo.o nNetwork.o nNetObject.o nSysdep.o nConfig.o\
nKrawall.o nKrawallPrivate.o nAuthentification.o md5.o nObserver.o \
--- 38,44 ----
# *
#*********************************************************
! LIBS=-lSDL_image -ljpeg -lpng -lz -lGLU -lGL -lSDL-1.1 -lm -lpthread -L/usr/local/lib -L/usr/X11R6/lib
NETWORK=nServerInfo.o nNetwork.o nNetObject.o nSysdep.o nConfig.o\
nKrawall.o nKrawallPrivate.o nAuthentification.o md5.o nObserver.o \
*** src/tron/Makefile.in.orig Mon Jan 31 17:44:11 2005
--- src/tron//Makefile.in Wed Jul 6 14:06:34 2005
***************
*** 40,46 ****
# *
#*********************************************************
! LIBS=@LIBS@
TRON_OBJ = gServerBrowser.o gFloor.o gWall.o gAIBase.o gArmagetron.o\
gCycle.o gGame.o gStuff.o gArena.o gSpawn.o gCamera.o gSensor.o\
--- 40,46 ----
# *
#*********************************************************
! LIBS=-lSDL_image -ljpeg -lpng -lz -lGLU -lGL -lSDL-1.1 -lm -lpthread -L/usr/X11R6/lib -L/usr/local/lib
TRON_OBJ = gServerBrowser.o gFloor.o gWall.o gAIBase.o gArmagetron.o\
gCycle.o gGame.o gStuff.o gArena.o gSpawn.o gCamera.o gSensor.o\
*** Makefile.global.in.orig Sat Feb 26 19:30:42 2005
--- Makefile.global.in Wed Jul 6 14:04:50 2005
***************
*** 7,16 ****
# name of the LaTeX command
LATEX.LINUX=ltx
CXX =@CXX@
CXXCPP =@CXXCPP@
CXX =@CXX@
! CXXFLAGS=@CXXFLAGS@
#*********************************************************
# Implicit Rules *
--- 7,16 ----
# name of the LaTeX command
LATEX.LINUX=ltx
CXX =@CXX@
CXXCPP =@CXXCPP@
CXX =@CXX@
! CXXFLAGS=-I. -I.. -I../.. -g -O2 -I/usr/local/include/SDL11 -L/usr/X11R6/lib -I/usr/X11R6/include -I/usr/local/include -D_REENTRANT