[Wesnoth-cvs-commits] wesnoth ./configure.ac src/campaign_server/Make...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/02/03 18:39:30

Modified files:
        .              : configure.ac 
        src/campaign_server: Makefile.am 
        src/server     : Makefile.am 
        src/tools      : Makefile.am 

Log message:
        Without these changes, neither wesnothd nor campaignd nor the tools 
link when zipios is available (Debian sid). I've no idea how correct my fix is, 
so please review.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/campaign_server/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/Makefile.am.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tools/Makefile.am.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.111 wesnoth/configure.ac:1.112
--- wesnoth/configure.ac:1.111  Wed Jan 26 09:52:27 2005
+++ wesnoth/configure.ac        Thu Feb  3 18:39:29 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.111 $])
+AC_REVISION([$Revision: 1.112 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -495,7 +495,7 @@
 AC_LANG(C++)
 AC_MSG_CHECKING([for libzipios++])
 OLD_LIBS="$LIBS"
-LIBS="$LIBS -lzipios"
+LIBS="-lzipios -lz"
 LIBZIPIOS=
 AC_LINK_IFELSE([AC_LANG_SOURCE([
 #include <zipios++/dircoll.h>
@@ -505,7 +505,7 @@
 }
        ])],
        [AC_MSG_RESULT(yes)
-       LIBZIPIOS=-lzipios
+       LIBZIPIOS="-lzipios -lz"
        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])])
Index: wesnoth/src/campaign_server/Makefile.am
diff -u wesnoth/src/campaign_server/Makefile.am:1.5 
wesnoth/src/campaign_server/Makefile.am:1.6
--- wesnoth/src/campaign_server/Makefile.am:1.5 Sat Jan 22 14:29:02 2005
+++ wesnoth/src/campaign_server/Makefile.am     Thu Feb  3 18:39:30 2005
@@ -29,4 +29,4 @@
                   ../zipios++/xcoll.hpp
 
 AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\" -I$(srcdir)/..
-AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@ $(LIBZIPIOS)
+LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
Index: wesnoth/src/server/Makefile.am
diff -u wesnoth/src/server/Makefile.am:1.14 wesnoth/src/server/Makefile.am:1.15
--- wesnoth/src/server/Makefile.am:1.14 Sat Jan 22 14:29:03 2005
+++ wesnoth/src/server/Makefile.am      Thu Feb  3 18:39:30 2005
@@ -35,4 +35,4 @@
                   ../zipios++/xcoll.hpp
 
 AM_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(LOCALEDIR)\" -I$(srcdir)/..
-AM_LDFLAGS = @SDL_LIBS@ @SDL_NET_LIBS@ $(LIBZIPIOS)
+LDADD = @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
Index: wesnoth/src/tools/Makefile.am
diff -u wesnoth/src/tools/Makefile.am:1.14 wesnoth/src/tools/Makefile.am:1.15
--- wesnoth/src/tools/Makefile.am:1.14  Sat Jan 22 14:29:03 2005
+++ wesnoth/src/tools/Makefile.am       Thu Feb  3 18:39:30 2005
@@ -8,8 +8,6 @@
 
 AM_CXXFLAGS = @SDL_CFLAGS@ @PNG_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" -I../ 
\
              -DLOCALEDIR=\"$(LOCALEDIR)\" -I$(srcdir)/..
-AM_LDFLAGS = @SDL_LIBS@
-
 
 exploder_SOURCES = exploder.cpp \
                   exploder_utils.cpp \
@@ -47,7 +45,7 @@
                   ../gettext.cpp
 
 
-exploder_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @PNG_LIBS@ $(LIBZIPIOS)
-cutter_LDFLAGS = @SDL_LIBS@ @SDL_IMAGE_LIBS@ @PNG_LIBS@ $(LIBZIPIOS)
+exploder_LDADD = @SDL_IMAGE_LIBS@ @PNG_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
+cutter_LDADD = @SDL_IMAGE_LIBS@ @PNG_LIBS@ @SDL_LIBS@ $(LIBZIPIOS)
 
 endif