This commit is contained in:
Vítor Santos Costa 2010-05-10 10:22:42 +01:00
parent 8340886b31
commit 55019a83bd
4 changed files with 18 additions and 3 deletions

10
configure vendored
View File

@ -631,6 +631,7 @@ NO_BUILTIN_REGEXP
YAP_EXTRAS
DYNYAPLIB
YAPLIB
EXTRA_LIBS_FOR_DLLS
DYNLIB_LD
SHLIB_SWI_LD
SHLIB_LOWER_CXX_LD
@ -4948,6 +4949,7 @@ _ACEOF
fi
EXTRA_LIBS_FOR_DLLS=-lws2_32
else
if test "$target_os" = "cygwin"
then
@ -5036,7 +5038,12 @@ fi
yap_cv_readline=no
if test "$prefix" = "NONE"
then
prefix="\${SYSTEMDRIVE}/Yap"
if test "$target_win64" = yes
then
prefix="\${SYSTEMDRIVE}/Yap64"
else
prefix="\${SYSTEMDRIVE}/Yap"
fi
fi
ENABLE_WINCONSOLE=""
else
@ -8235,6 +8242,7 @@ EXEC_SUFFIX=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc threaded code" >&5

View File

@ -519,6 +519,7 @@ then
if test "$target_win64" = yes
then
AC_CHECK_LIB(ws2_32,main)
EXTRA_LIBS_FOR_DLLS=-lws2_32
else
if test "$target_os" = "cygwin"
then
@ -531,7 +532,12 @@ then
yap_cv_readline=no
if test "$prefix" = "NONE"
then
prefix="\${SYSTEMDRIVE}/Yap"
if test "$target_win64" = yes
then
prefix="\${SYSTEMDRIVE}/Yap64"
else
prefix="\${SYSTEMDRIVE}/Yap"
fi
fi
ENABLE_WINCONSOLE=""
else
@ -1306,6 +1312,7 @@ AC_SUBST(SHLIB_LOWER_LD)
AC_SUBST(SHLIB_LOWER_CXX_LD)
AC_SUBST(SHLIB_SWI_LD)
AC_SUBST(DYNLIB_LD)
AC_SUBST(EXTRA_LIBS_FOR_DLLS)
dnl objects in YAP library
AC_SUBST(YAPLIB)
AC_SUBST(DYNYAPLIB)

View File

@ -80,7 +80,7 @@ uxnt.o: $(srcdir)/uxnt/uxnt.c
@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
@DO_SECOND_LD@plstream@SHLIB_SUFFIX@: $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS)
@DO_SECOND_LD@ @SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)

0
pl/consult.yap Normal file → Executable file
View File