qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-21 10:51:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

finally. no more undefined symbol "gzgets" :)

Browse source
This commit is contained in:
Bill Currie 2000-10-30 21:16:46 +00:00
parent 47eea32832
commit cdedafcbf3
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
configure.in
View file

@ -195,7 +195,7 @@ if test "x$enable_zlib" != "xno"; then
if test "x$HAVE_ZLIB" = "xyes"; then
AC_CHECK_HEADER(zlib.h, HAVE_ZLIB=yes, HAVE_ZLIB=no)
if test "x$HAVE_ZLIB" = "xyes"; then
LIBS="-lz $LIBS"
Z_LIBS="-lz"
AC_DEFINE(HAVE_ZLIB)
fi
fi
@ -983,6 +983,43 @@ if test "x$GCC" = xyes; then
# CFLAGS="$CFLAGS -Wall -pedantic"
fi
dnl ==================================================================
dnl Make sure we link against a working zlib
dnl ==================================================================
AC_MSG_CHECKING(for libz.a in X11)
need_abs_libz=no
for d in `echo $X_LIBS | sed -e 's/-L//'`; do
if test -f $d/libz.a; then
need_abs_libz=yes
break
fi
done
AC_MSG_RESULT($need_abs_libz)
AC_ARG_WITH(libz,
[ --with-libz=<path list> specify directories to search for zlib],
zlib_paths="$withval", zlib_paths="")
if test "x$need_abs_libz" = "xyes"; then
AC_MSG_CHECKING(for location of libz.a or libz.so)
zlib_location="unknown"
for d in $zlib_paths /usr/local/lib /usr/lib; do
for f in libz.so libz.a; do
if test -f $d/$f; then
zlib_location=$d/$f
break
fi
done
done
AC_MSG_RESULT($zlib_location)
if test "$zlib_location" = unknown; then
echo need to specify zlib location with --with-zlib
exit 1
fi
Z_LIBS="$zlib_location"
fi
AC_SUBST(Z_LIBS)
dnl ==================================================================
dnl Find out what to build and finish
dnl ==================================================================

4
source/Makefile.am
View file

@ -71,7 +71,7 @@ server_SOURCES= pr_cmds.c pr_edict.c pr_exec.c pr_offs.c sv_init.c sv_main.c \
$(world_ASM)
qf_server_SOURCES= $(common_SOURCES) $(server_SOURCES)
qf_server_LDADD= -L. -lqfsys_sv $(NET_LIBS) $(DL_LIBS)
qf_server_LDADD= -L. -lqfsys_sv $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)
qf_server_DEPENDENCIES= libqfsys_sv.a
#
@ -139,7 +139,7 @@ endif
libqfjs_a_CFLAGS= $(JOY_CFLAGS)
EXTRA_libqfjs_a_SOURCES = joy_linux.c joy_null.c
CLIENT_LIBS= -L. -lqfsys_cl -lqfsnd -lqfcd -lqfjs $(SOUND_LIBS) $(NET_LIBS) $(JOY_LIBS)
CLIENT_LIBS= -L. -lqfsys_cl -lqfsnd -lqfcd -lqfjs $(SOUND_LIBS) $(NET_LIBS) $(JOY_LIBS) $(Z_LIBS)
if ASM_ARCH
client_ASM= snd_mixa.S cl_math.S sys_x86.S