Moved libpng check before SDL_image check, since the latter requires the former.

2 files changed, 18 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 1919da83..7b8f46f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
+2006-08-20  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* configure.ac: Moved libpng check before SDL_image check, since the
+	latter requires the former.
+
 2006-08-20  Yohann Ferreira  <bertram@cegetel.net>
+
 	* data/graphics/sprites/Makefile.am : Following the splitting from
 	Philipp, moved out the items.png file from the Makefile.am.
 	* debian/control, debian/tmw-data.install : Updated debian package
@@ -7,18 +13,20 @@
 	with gcc 4.1.2. Happy to be back :)
 
 2006-08-17  Philipp Sehmisch  <tmw@crushnet.org>
+
 	* data/graphics/items/*: Splitted the items.png into separate images
 	with more distinctive names. (no, i won't list all 114)
 	* src/itemmanager.cpp, data/items.xml: Replaced indices on the item
 	spriteset with filenames. added names and descriptions for all missing
 	items. Changed names and dascriptions of some items.
 	* src/engine.cpp: removed global item spriteset.
-	* src/floor_item.cpp, src/floor_item.h, src/iteminfo.cpp, src/iteminfo.h
-	src/equipmentwindow.cpp, src/equipmentwindow.h, src/itemcontainer.cpp,
-	src/itemcontainer.h: the iteminfo class now provides a pointer to the item
-	icon image instead of providing the index on the item spriteset.
-	* data/graphics/tiles/trans_desert-woodland.png: added transmission tileset
-	between desert and woodland.
+	* src/floor_item.cpp, src/floor_item.h, src/iteminfo.cpp,
+	src/iteminfo.h, src/equipmentwindow.cpp, src/equipmentwindow.h,
+	src/itemcontainer.cpp, src/itemcontainer.h: the iteminfo class now
+	provides a pointer to the item icon image instead of providing the
+	index on the item spriteset.
+	* data/graphics/tiles/trans_desert-woodland.png: added transmission
+	tileset between desert and woodland.
 
 2006-08-13  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
@@ -2722,4 +2730,4 @@
 	restore some doxygen comments, improved size adaption and made the
 	window a shorter.
 	* data/graphics/images/login_wallpaper.png: New login wallpaper by
-	Momotaro.
\ No newline at end of file
+	Momotaro.
diff --git a/configure.ac b/configure.ac
index 6c1d571f..c0816aa7 100755
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,9 @@ AC_SUBST(CURL_CFLAGS)
 AC_CHECK_LIB([xml2], [xmlInitParser], ,
 AC_MSG_ERROR([ *** Unable to find libxml2 library (xmlsoft.org)]))
 
+AC_CHECK_LIB(png, png_write_info, ,
+AC_MSG_ERROR([ *** Unable to find png library]))
+
 AC_CHECK_LIB(SDL_image, IMG_LoadPNG_RW, ,
 AC_MSG_ERROR([ *** Unable to find SDL_image library with PNG support
 (http://www.libsdl.org/projects/SDL_image/)]))
@@ -60,9 +63,6 @@ AC_MSG_ERROR([ *** Unable to find SDL_mixer library
 AC_CHECK_LIB(SDL_net, SDLNet_Init, ,
 AC_MSG_ERROR([ *** Unable to find SDL_net library]))
 
-AC_CHECK_LIB(png, png_write_info, ,
-AC_MSG_ERROR([ *** Unable to find png library]))
-
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h])