[Wesnoth-cvs-commits] wesnoth ./changelog ./configure.ac src/Makefile...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/01/08 13:57:23

Modified files:
        .              : changelog configure.ac 
        src            : Makefile.am image.cpp sound.cpp 
        src/zipios++   : xcoll.cpp 

Log message:
        made configure to activate zipios++ support when the lib is found

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.432&tr2=1.433&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/image.cpp.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sound.cpp.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/zipios++/xcoll.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.432 wesnoth/changelog:1.433
--- wesnoth/changelog:1.432     Fri Jan  7 22:09:08 2005
+++ wesnoth/changelog   Sat Jan  8 13:57:22 2005
@@ -21,6 +21,7 @@
    * Death Knight
    * Lord
    * Master Bowman
+ * take advantage of libzipios++ if available, to read cfg files, maps, 
images, and sound effects from zip files
  * fixed missing Deathblade in multiplayer
  * downloaded campaigns no longer require a restart to be able to play them
  * multiplayer game settings (map name, gold per village, ...) are saved now
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.107 wesnoth/configure.ac:1.108
--- wesnoth/configure.ac:1.107  Fri Dec 17 02:22:57 2004
+++ wesnoth/configure.ac        Sat Jan  8 13:57:22 2005
@@ -10,7 +10,7 @@
 dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default 
server for this version])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org:14999"], [The default 
server for this version])
 
-AC_REVISION([$Revision: 1.107 $])
+AC_REVISION([$Revision: 1.108 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -492,6 +492,25 @@
 
 AC_SUBST([FREETYPE_LIBS])
 
+AC_LANG(C++)
+AC_MSG_CHECKING([for libzipios++])
+OLD_LIBS="$LIBS"
+LIBS="$LIBS -lzipios"
+LIBZIPIOS=
+AC_LINK_IFELSE([AC_LANG_SOURCE([
+#include <zipios++/dircoll.h>
+int main(int argc, char **argv)
+{
+       zipios::DirectoryCollection z("src");
+}
+       ])],
+       [AC_MSG_RESULT(yes)
+       LIBZIPIOS=-lzipios
+       AC_DEFINE([USE_ZIPIOS],[1],[Make use of the zipios++ library to read 
data in zip files])],
+       [AC_MSG_RESULT(no)
+       AC_MSG_WARN([*** libzipios++ not found - support for ZIP files is 
disabled])])
+LIBS="$OLD_LIBS"
+AC_SUBST([LIBZIPIOS])
 
 #######################################################################
 # Checks for header files.                                            #
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.65 wesnoth/src/Makefile.am:1.66
--- wesnoth/src/Makefile.am:1.65        Wed Jan  5 23:25:33 2005
+++ wesnoth/src/Makefile.am     Sat Jan  8 13:57:23 2005
@@ -356,7 +356,7 @@
 
 
 LIBS = $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
-       $(SDL_TTF_LIBS) $(SDL_LIBS) $(FREETYPE_LIBS) $(LIBINTL)
+       $(SDL_TTF_LIBS) $(SDL_LIBS) $(LIBZIPIOS) $(FREETYPE_LIBS) $(LIBINTL)
 
 if STATIC
 LDFLAGS += -all-static
Index: wesnoth/src/image.cpp
diff -u wesnoth/src/image.cpp:1.70 wesnoth/src/image.cpp:1.71
--- wesnoth/src/image.cpp:1.70  Sat Jan  8 00:13:30 2005
+++ wesnoth/src/image.cpp       Sat Jan  8 13:57:23 2005
@@ -11,6 +11,7 @@
 #include "team.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "wesconfig.h"
 
 #include "SDL_image.h"
 
Index: wesnoth/src/sound.cpp
diff -u wesnoth/src/sound.cpp:1.26 wesnoth/src/sound.cpp:1.27
--- wesnoth/src/sound.cpp:1.26  Sat Jan  8 00:28:41 2005
+++ wesnoth/src/sound.cpp       Sat Jan  8 13:57:23 2005
@@ -1,4 +1,4 @@
-/* $Id: sound.cpp,v 1.26 2005/01/08 00:28:41 ydirson Exp $ */
+/* $Id: sound.cpp,v 1.27 2005/01/08 13:57:23 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -17,6 +17,7 @@
 #include "game_config.hpp"
 #include "log.hpp"
 #include "sound.hpp"
+#include "wesconfig.h"
 
 #include "SDL_mixer.h"
 
Index: wesnoth/src/zipios++/xcoll.cpp
diff -u wesnoth/src/zipios++/xcoll.cpp:1.1 wesnoth/src/zipios++/xcoll.cpp:1.2
--- wesnoth/src/zipios++/xcoll.cpp:1.1  Wed Jan  5 23:25:33 2005
+++ wesnoth/src/zipios++/xcoll.cpp      Sat Jan  8 13:57:23 2005
@@ -1,3 +1,5 @@
+#include "wesconfig.h"
+
 #ifdef USE_ZIPIOS
 
 #include <vector>