configure.ac: Fix typo.

src/Makefile.am: Remove useless (duplicate) -lpng.
src/graphics.cpp: Add missing cstdarg header.
src/net/messagein.cpp: Fix some funny looking preprocessor statement.
src/net/messageout.cpp: Readd SDLnet header, for changed preprocessor stuff.

6 files changed, 18 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index c65added..ef622d3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,12 @@
 2005-09-17 Duane Bailey <nayryeliab@gmail.com>
-	
-	* src/net/messagin.cpp, src/net/messageout.cpp, src/net/network.cpp: 
+
+	* src/net/messagin.cpp, src/net/messageout.cpp, src/net/network.cpp:
 	removed replaced MACOSX defines with big endian defines
 	* src/graphics.cpp, src/graphics.h: added screenshot method
 	* src/game.cpp: added code, so that when one presses 'alt-p' (for
 	picture), it takes a screenshot and saves it to a png
 	* src/Makefile.am, config.ac: added png library stuff
-	
+
 2005-09-17  Matthias Hartmann  <hartmann.matthias@gmail.com>
 
 	* src/engine.cpp: [TARGET] text over player
@@ -21,6 +21,13 @@
 
 2005-09-17  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
+	* configure.ac: Fix typo.
+	* src/Makefile.am: Remove useless (duplicate) -lpng.
+	* src/graphics.cpp: Add missing cstdarg header.
+	* src/net/messagein.cpp: Fix some funny looking preprocessor
+	statement.
+	* src/net/messageout.cpp: Readd SDLnet header, for changed
+	preprocessor stuff.
 	* src/game.h: Remove inclusion of being.h, there was a forward
 	declaration of class Being anyways...
 	* src/openglgraphics.cpp: Use gl{Push,Pop}Matrix instead of
diff --git a/configure.ac b/configure.ac
index c4b98519..4e9cffde 100755
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_CHECK_LIB(SDL_net, SDLNet_Init, ,
 AC_MSG_ERROR([ *** Unable to find SDL_net library]))
 
 AC_CHECK_LIB(png, png_write_info, ,
-ACMSG_ERROR([ ** Unable to find png library]))
+AC_MSG_ERROR([ *** Unable to find png library]))
 
 # Checks for header files.
 AC_HEADER_STDC
diff --git a/src/Makefile.am b/src/Makefile.am
index a400b149..5e866f71 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -180,5 +180,5 @@ INCLUDES =					\
 # the library search path.
 tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
 tmw_CXXFLAGS = -Wall $(OPENGL_CFLAGS) $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS)
-tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl -lguichan $(OPENGL_LIBS) -lphysfs $(CURL_LIBS) -lpng
+tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl -lguichan $(OPENGL_LIBS) -lphysfs $(CURL_LIBS)
 tmw_TARGET = tmw
diff --git a/src/graphics.cpp b/src/graphics.cpp
index ecee2b5f..f12d3898 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -23,14 +23,15 @@
 
 #include "graphics.h"
 
+#include <cstdarg>
+#include <png.h>
+
 #include "log.h"
 
 #include "graphic/imagerect.h"
 
 #include "resources/image.h"
 
-#include <png.h>
-
 extern volatile int framesToDraw;
 
 Graphics::Graphics():
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index c4d933cc..9ea6f12e 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -25,7 +25,7 @@
 
 #include <cassert>
 #include <SDL_net.h>
-#if SDL_BYTEORDER == SDL_if SDL_BYTEORDER == SDL_BIG_ENDIAN_ENDIAN
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
 #include "win2mac.h"
 #endif
 
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index ed66f454..daf5ebf4 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -24,7 +24,7 @@
 #include "messageout.h"
 
 #include <string>
-//#include <SDL_net.h>
+#include <SDL_net.h>
 #include "win2mac.h"
 
 #include "network.h"
@@ -106,7 +106,7 @@ void MessageOut::writeString(const std::string &string, int length)
         toWrite = string.substr(0, length);
         expand(mPos + length);
     }
-    
+
     // Write the actual string
     memcpy(&mData[mPos], (void*)toWrite.c_str(), toWrite.length());
     mPos += toWrite.length();