diff options
| -rw-r--r-- | configure.ac | 66 | ||||
| -rw-r--r-- | lib/Makefile.am | 19 |
2 files changed, 57 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index 96caac4..6f70efc 100644 --- a/configure.ac +++ b/configure.ac @@ -60,32 +60,33 @@ AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify getcwd gethostbyname m AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(gethostbyname, nsl) -AC_SEARCH_LIBS(deflate, z) - -if test x$ac_cv_search_deflate != xno ; then - OLDCPPFLAGS=$CPPFLAGS - CPPFLAGS="-Werror" - AC_CACHE_CHECK([for well defined gzwrite in zlib.h], ac_cv_wd_gzwrite, - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <zlib.h>]], - [[const char * buf = "Poide"; gzwrite(NULL, buf, 10);]] - )], - [AC_DEFINE([HAVE_WD_ZLIB], 1, [Have a well structured ZLIB]) - ac_cv_wd_gzwrite="yes"],[ac_cv_wd_gzwrite="no" - ]) - ) - CPPFLAGS=$OLDCPPFLAGS -else - AC_MSG_ERROR([no zlib found in the system.]) -fi - -if test x$ac_cv_wd_gzwrite != xyes ; then - AC_MSG_WARN([You have a broken zconf.h.] - [You should patch this using] - [the zconf.h-patch file.] - [Enabling workaround.]) -fi +#AC_SEARCH_LIBS(deflate, z) +# +#if test x$ac_cv_search_deflate != xno ; then +# OLDCPPFLAGS=$CPPFLAGS +# CPPFLAGS="-Werror" +# AC_CACHE_CHECK([for well defined gzwrite in zlib.h], ac_cv_wd_gzwrite, +# AC_COMPILE_IFELSE( +# [AC_LANG_PROGRAM( +# [[#include <zlib.h>]], +# [[const char * buf = "Poide"; gzwrite(NULL, buf, 10);]] +# )], +# [AC_DEFINE([HAVE_WD_ZLIB], 1, [Have a well structured ZLIB]) +# ac_cv_wd_gzwrite="yes"],[ac_cv_wd_gzwrite="no" +# ]) +# ) +# CPPFLAGS=$OLDCPPFLAGS +#else +# AC_MSG_ERROR([no zlib found in the system.]) +#fi +# +#if test x$ac_cv_wd_gzwrite != xyes ; then +# AC_MSG_WARN([You have a broken zconf.h.] +# [You should patch this using] +# [the zconf.h-patch file.] +# [Enabling workaround.]) +#fi +AC_DEFINE([HAVE_WD_ZLIB], 1, [Have a well structured ZLIB]) GMP_LIBS="-lm" AC_LANG_PUSH(C++) @@ -127,6 +128,19 @@ AC_DEFINE([HOOK_STDS], 1, [Hook the standard input/outputs]) AC_CHECK_FUNCS(gethostbyname) AC_CHECK_FUNCS(regcomp) AC_CHECK_FUNCS(socket) +AC_CHECK_FUNCS([atexit]) +AC_CHECK_FUNCS([floor]) +AC_CHECK_FUNCS([memchr]) +AC_CHECK_FUNCS([pow]) +AC_CHECK_FUNCS([sqrt]) +AC_CHECK_FUNCS([strpbrk]) +AC_CHECK_FUNCS([strtol]) +AC_CHECK_TYPES([ptrdiff_t]) +AC_FUNC_ERROR_AT_LINE +AC_FUNC_MEMCMP +AC_FUNC_MKTIME +AC_FUNC_STRCOLL +AC_FUNC_STRTOD AC_PATH_PROG(gmakepath, gmake) AC_PATH_PROG(unamepath, uname) diff --git a/lib/Makefile.am b/lib/Makefile.am index af41ae2..4d22c9f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ localedir = $(datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ AM_CPPFLAGS = -O3 -Wall -Wstrict-prototypes -g @MYSQL_CFLAGS@ -fexceptions LIBS = @MYSQL_LIBS@ -INCLUDES = -I.. -I../include -I$(includedir) -Ilua/include -Ilua/includes +INCLUDES = -I.. -I../include -I$(includedir) -Ilua/include -Ilua/includes -Izlib/include lib_LTLIBRARIES = libBaltisot.la libBaltisot_la_SOURCES = Action.cc Buffer.cc checkargs.c Confirm.cc CopyJob.cc \ @@ -39,4 +39,19 @@ lua/src/ltm.c \ lua/src/luacomp.c \ lua/src/lundump.c \ lua/src/lvm.c \ -lua/src/lzio.c +lua/src/lzio.c \ +\ +zlib/src/adler32.c \ +zlib/src/compress.c \ +zlib/src/crc32.c \ +zlib/src/deflate.c \ +zlib/src/gzio.c \ +zlib/src/infblock.c \ +zlib/src/infcodes.c \ +zlib/src/inffast.c \ +zlib/src/inflate.c \ +zlib/src/inftrees.c \ +zlib/src/infutil.c \ +zlib/src/trees.c \ +zlib/src/uncompr.c \ +zlib/src/zutil.c |