diogo
/
yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ../yap-6.2

This commit is contained in:
Vítor Santos Costa 2010-12-03 12:13:14 +00:00
parent bdd7ea45d1 f8806bed9f
commit 856a32bd19
3 changed files with 265 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

494
configure vendored
View File

File diff suppressed because it is too large Load Diff

3
configure.in
View File

@ -1835,6 +1835,8 @@ AC_CHECK_FUNC(gethostent, [], [
"Define if you have the nsl library (-lnsl)."))])
fi
AC_CHECK_LIB(pthread, pthread_create,
[CLIB_PTHREADS="-lpthread"],[CLIB_PTHREADS=""])
oldlibs="$LIBS"
AC_CHECK_LIB(crypt, crypt)
@ -1842,6 +1844,7 @@ CLIB_CRYPTLIBS="$LIBS"
AC_CHECK_FUNCS(crypt)
LIBS="$oldlibs"
AC_SUBST(CLIB_PTHREADS)
AC_SUBST(CLIB_TARGETS)
AC_SUBST(CLIB_PLTARGETS)
AC_SUBST(CLIB_NETLIBS)

11
packages/clib/Makefile.in
View File

@ -36,6 +36,7 @@ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../
MKINDEX=true
NETLIBS=@CLIB_NETLIBS@
CRYPTLIBS=@CLIB_CRYPTLIBS@
PTHREADLIBS=@CLIB_PTHREADS@
LD=@DO_SECOND_LD@ @SHLIB_LD@
LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
@ -127,17 +128,17 @@ random.@SO@: $(RANDOMOBJ)
unix.@SO@: $(UNXOBJ)
$(LD) $(LDFLAGS) -o $@ $(UNXOBJ)
socket.@SO@: $(SOCKOBJ)
$(LD) $(LDFLAGS) -o $@ $(SOCKOBJ) $(NETLIBS)
$(LD) $(LDFLAGS) -o $@ $(SOCKOBJ) $(NETLIBS) $(PTHREADLIBS)
cgi.@SO@: $(CGIOBJ)
$(LD) $(LDFLAGS) -o $@ $(CGIOBJ)
$(LD) $(LDFLAGS) -o $@ $(CGIOBJ) $(PTHREADLIBS)
crypt.@SO@: $(CRYPTOBJ)
$(LD) $(LDFLAGS) -o $@ $(CRYPTOBJ) $(CRYPTLIBS)
$(LD) $(LDFLAGS) -o $@ $(CRYPTOBJ) $(CRYPTLIBS) $(PTHREADLIBS)
memfile.@SO@: $(MEMOBJ)
$(LD) $(LDFLAGS) -o $@ $(MEMOBJ) $(LIBS)
mime.@SO@: $(MIMEOBJ) $(MIMELIBS)
$(LD) $(LDFLAGS) -o $@ $(MIMEOBJ) $(MIMELIBS)
time.@SO@: $(TIMEOBJ)
$(LD) $(LDFLAGS) -o $@ $(TIMEOBJ) $(LIBS)
$(LD) $(LDFLAGS) -o $@ $(TIMEOBJ) $(LIBS) $(PTHREADLIBS)
files.@SO@: $(FILESOBJ)
$(LD) $(LDFLAGS) -o $@ $(FILESOBJ) $(LIBS)
rlimit.@SO@: $(RLIMITOBJ)
@ -151,7 +152,7 @@ streaminfo.@SO@: $(STREAMINFOOBJ)
sha4pl.@SO@: $(SHAOBJ)
$(LD) $(LDFLAGS) -o $@ $(SHAOBJ)
uri.@SO@: $(URIOBJ)
$(LD) $(LDFLAGS) -o $@ $(URIOBJ)
$(LD) $(LDFLAGS) -o $@ $(URIOBJ) $(PTHREADLIBS)
socket.o: $(srcdir)/socket.c $(srcdir)/sockcommon.c