0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added configure --without-zipios

Browse source
This commit is contained in:
Yann Dirson 2006-01-05 22:29:44 +00:00
parent e2ede6a590
commit 21f9b136e9
2 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -23,6 +23,8 @@ SVN trunk (1.1+svn):
* Miscelleneous
* Added anonymous data logging for single player campaigns, see
stats.wesnoth.org
* Support for zipios++ can now be disabled by passing --without-zipios
to configure - no need to de/re-install it anymore.
Version 1.1:
* campaign server

41
configure.ac
View file

@ -647,24 +647,33 @@ fi
AC_SUBST([FREETYPE_LIBS])
AC_ARG_WITH([zipios],
AS_HELP_STRING([--without-zipios], [Do not use zipios++ even if installed]),
[checkzipios="$withval"],
[checkzipios="yes"])
AC_LANG(C++)
AC_MSG_CHECKING([for libzipios++])
OLD_LIBS="$LIBS"
LIBS="-lzipios -lz"
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 -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])])
LIBS="$OLD_LIBS"
if test $checkzipios = yes; then
AC_MSG_CHECKING([for libzipios++])
OLD_LIBS="$LIBS"
LIBS="-lzipios -lz"
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 -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])])
LIBS="$OLD_LIBS"
else
AC_MSG_NOTICE([skipping check for libzipios++])
fi
AC_SUBST([LIBZIPIOS])
#######################################################################