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.
This commit is contained in:
Guillaume Melquiond 2005-02-03 18:39:30 +00:00
parent c5ebfc7d35
commit 93d55563c4
4 changed files with 6 additions and 8 deletions

View file

@ -495,7 +495,7 @@ AC_SUBST([FREETYPE_LIBS])
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 @@ int main(int argc, char **argv)
}
])],
[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])])

View file

@ -29,4 +29,4 @@ campaignd_SOURCES = campaign_server.cpp \
../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)

View file

@ -35,4 +35,4 @@ wesnothd_SOURCES = game.cpp \
../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)

View file

@ -8,8 +8,6 @@ bin_PROGRAMS = exploder cutter
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 @@ cutter_SOURCES = cutter.cpp \
../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