zlib now linked in. I'll test tonight at home

This commit is contained in:
Bill Currie 2000-09-19 23:01:46 +00:00
parent 9752037248
commit a8e188eb5c
4 changed files with 28 additions and 2 deletions

View file

@ -79,6 +79,9 @@
/* Define if you have the dlopen function. */
#undef HAVE_DLOPEN
/* Define if you have zlib */
#undef HAS_ZLIB
/* If your version of OpenGL uses APIENTRY, define GLAPIENTRY to be APIENTRY */
#undef GLAPIENTRY

View file

@ -185,6 +185,22 @@ fi
dnl Checks for working -lm
AC_CHECK_LIB(m, pow,, AC_MSG_ERROR([math library (-lm) appears broken]))
if test "x$enable_zlib" != "xno"; then
dnl Check for working -lz
dnl Note - must have gztell *and* gzgets in -lz *and* zlib.h
AC_CHECK_LIB(z, gztell, HAS_ZLIB=yes, HAS_ZLIB=no, [$LIBS])
if test "x$HAS_ZLIB" = "xyes"; then
AC_CHECK_LIB(z, gzgets, HAS_ZLIB=yes, HAS_ZLIB=no, [$LIBS])
if test "x$HAS_ZLIB" = "xyes"; then
AC_CHECK_HEADER(zlib.h, HAS_ZLIB=yes, HAS_ZLIB=no)
if test "x$HAS_ZLIB" = "xyes"; then
LIBS="-lz $LIBS"
AC_DEFINE(HAS_ZLIB)
fi
fi
fi
fi
dnl Checks for MGL support
AC_ARG_WITH(mgl,
[ --with-mgl[=DIR] use MGL found in DIR],
@ -555,7 +571,11 @@ AC_CHECK_LIB(mme,waveOutOpen,HAVE_LIBMME=yes)
AC_ARG_ENABLE(alsa,
[ --disable-alsa disable alsa support],
)
)
AC_ARG_ENABLE(zlib,
[ --disable-zlib disable zlib support],
)
SNDTYPE=""
SOUND_LIBS=""

View file

@ -142,6 +142,9 @@
/* Define if you have the dlopen function. */
#undef HAVE_DLOPEN
/* Define if you have zlib */
#undef HAS_ZLIB
/* Define this to something sane if you don't have stricmp */
#undef stricmp

View file

@ -54,7 +54,7 @@
#include "sys.h"
#include "console.h"
extern int gethostname (char *, int);
//extern int gethostname (char *, int);
extern int close (int);
static int net_acceptsocket = -1; // socket for fielding new connections