mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-26 22:31:05 +00:00
move fnmatch.c and dirent.c to libQFutil
This commit is contained in:
parent
22a1a0d5d3
commit
b5df1c816a
4 changed files with 24 additions and 4 deletions
11
configure.in
11
configure.in
|
@ -158,6 +158,17 @@ else
|
||||||
AC_C_BIGENDIAN
|
AC_C_BIGENDIAN
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_MSG_CHECKING(for fnmatch)
|
||||||
|
AC_TRY_LINK(
|
||||||
|
[],
|
||||||
|
[fnmatch();],
|
||||||
|
BUILD_FNMATCH=no
|
||||||
|
AC_MSG_RESULT(yes),
|
||||||
|
BUILD_FNMATCH=yes
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
)
|
||||||
|
AM_CONDITIONAL(BUILD_FNMATCH, test "$BUILD_FNMATCH" = "yes")
|
||||||
|
|
||||||
AC_MSG_CHECKING(for fnmatch in fnmatch.h)
|
AC_MSG_CHECKING(for fnmatch in fnmatch.h)
|
||||||
AC_TRY_COMPILE(
|
AC_TRY_COMPILE(
|
||||||
[#include "fnmatch.h"],
|
[#include "fnmatch.h"],
|
||||||
|
|
|
@ -2,12 +2,21 @@ INCLUDES= -I$(top_srcdir)/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libQFutil.la
|
lib_LTLIBRARIES = libQFutil.la
|
||||||
|
|
||||||
|
if BUILD_FNMATCH
|
||||||
|
fnmatch_SRC = fnmatch.c dirent.c
|
||||||
|
else
|
||||||
|
fnmatch_SRC =
|
||||||
|
endif
|
||||||
|
|
||||||
libQFutil_la_LDFLAGS = -version-info 1:0:0 $(Z_LIBS) $(DL_LIBS)
|
libQFutil_la_LDFLAGS = -version-info 1:0:0 $(Z_LIBS) $(DL_LIBS)
|
||||||
libQFutil_la_SOURCES = \
|
libQFutil_la_SOURCES = \
|
||||||
checksum.c cmd.c console.c con_print.c crc.c cvar.c hash.c \
|
checksum.c cmd.c console.c con_print.c crc.c cvar.c hash.c \
|
||||||
info.c link.c math.S \
|
info.c link.c math.S \
|
||||||
mathlib.c \
|
mathlib.c \
|
||||||
mdfour.c msg.c plugin.c qargs.c qendian.c qfplist.c quakefs.c \
|
mdfour.c msg.c plugin.c qargs.c qendian.c qfplist.c quakefs.c \
|
||||||
quakeio.c sizebuf.c sys.c sys_error.c va.c ver_check.c zone.c
|
quakeio.c sizebuf.c sys.c sys_error.c va.c ver_check.c zone.c \
|
||||||
|
$(fnmatch_SRC)
|
||||||
|
|
||||||
LIBLIST = libQFutil.la @LIBRARY_SEARCH_PATH@
|
LIBLIST = libQFutil.la @LIBRARY_SEARCH_PATH@
|
||||||
|
|
||||||
|
EXTRA_DIST = fnmatch.c dirent.c
|
||||||
|
|
|
@ -157,7 +157,7 @@ nq_server_DEPENDENCIES= libqfnet.a
|
||||||
|
|
||||||
# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
|
# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
|
||||||
# or it won't be distributed with 'make dist'
|
# or it won't be distributed with 'make dist'
|
||||||
EXTRA_DIST= #nq.dsp dirent.c fnmatch.c sys_unix.c sys_win.c
|
EXTRA_DIST= #nq.dsp sys_unix.c sys_win.c
|
||||||
|
|
||||||
# Kill the temp files, hopefully.
|
# Kill the temp files, hopefully.
|
||||||
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)
|
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)
|
||||||
|
|
|
@ -58,7 +58,7 @@ EXTRA_libqfnet_a_SOURCES= net_chan.c net_udp.c net_udp6.c
|
||||||
#
|
#
|
||||||
# ... System type
|
# ... System type
|
||||||
if SYSTYPE_WIN32
|
if SYSTYPE_WIN32
|
||||||
syssv_SRC= fnmatch.c dirent.c sv_sys_win.c
|
syssv_SRC= sv_sys_win.c
|
||||||
else
|
else
|
||||||
syssv_SRC= sv_sys_unix.c
|
syssv_SRC= sv_sys_unix.c
|
||||||
endif
|
endif
|
||||||
|
@ -78,7 +78,7 @@ qw_server_DEPENDENCIES= libqfnet.a
|
||||||
#
|
#
|
||||||
# ... System type
|
# ... System type
|
||||||
if SYSTYPE_WIN32
|
if SYSTYPE_WIN32
|
||||||
syscl_SRC= cl_sys_win.c fnmatch.c dirent.c
|
syscl_SRC= cl_sys_win.c
|
||||||
else
|
else
|
||||||
syscl_SRC= cl_sys_unix.c
|
syscl_SRC= cl_sys_unix.c
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue