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

better support for win32

Browse Source 
fix case where zlib is not available.
This commit is contained in:
Vítor Santos Costa 2010-08-03 12:27:23 +01:00
parent 3a3ca7f382
commit ebc22dc29f
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -565,7 +565,7 @@ install_unix: startup.yss libYap.a
@INSTALL_DLLS@ (cd packages/sgml; $(MAKE) install) @INSTALL_DLLS@ (cd packages/sgml; $(MAKE) install)
@INSTALL_DLLS@ (cd packages/RDF; $(MAKE) install) @INSTALL_DLLS@ (cd packages/RDF; $(MAKE) install)
@INSTALL_DLLS@ (cd packages/semweb; $(MAKE) install) @INSTALL_DLLS@ (cd packages/semweb; $(MAKE) install)
@INSTALL_DLLS@ (cd packages/zlib; $(MAKE) install) @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@)
@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)
@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
@ -618,7 +618,7 @@ install_win32: startup.yss
(cd packages/RDF; $(MAKE) install) (cd packages/RDF; $(MAKE) install)
(cd packages/sgml; $(MAKE) install) (cd packages/sgml; $(MAKE) install)
(cd packages/semweb; $(MAKE) install) (cd packages/semweb; $(MAKE) install)
(cd packages/zlib; $(MAKE) install) (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@)
@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
@USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install) @USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)

11
configure vendored
View File

@ -652,6 +652,7 @@ INSTALL_DLLS
ARCH ARCH
M4GENHDRS M4GENHDRS
M4 M4
ZLIB_INSTALL
ZLIB_PLTARGETS ZLIB_PLTARGETS
ZLIB_TARGETS ZLIB_TARGETS
ZLIBS ZLIBS
@ -3849,6 +3850,7 @@ if test "${with_gmp+set}" = set; then :
else else
yap_cv_gmp=$with_gmp yap_cv_gmp=$with_gmp
LDFLAGS="$LDFLAGS -L${yap_cv_gmp}/lib" LDFLAGS="$LDFLAGS -L${yap_cv_gmp}/lib"
LIBS="$LIBS -L${yap_cv_gmp}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include" CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include"
CFLAGS="$CFLAGS -I${yap_cv_gmp}/include" CFLAGS="$CFLAGS -I${yap_cv_gmp}/include"
fi fi
@ -5183,6 +5185,11 @@ _ACEOF
fi fi
yap_cv_readline=no yap_cv_readline=no
if test "$target_win64" = yes
CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
then
CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
fi
if test "$prefix" = "NONE" if test "$prefix" = "NONE"
then then
if test "$target_win64" = yes if test "$target_win64" = yes
@ -5191,7 +5198,6 @@ fi
CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32" CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
else else
prefix="\${SYSTEMDRIVE}/Yap" prefix="\${SYSTEMDRIVE}/Yap"
CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
fi fi
fi fi
ENABLE_WINCONSOLE="" ENABLE_WINCONSOLE=""
@ -7361,8 +7367,10 @@ fi
if test "$ZLIB" = yes; then if test "$ZLIB" = yes; then
ZLIB_TARGETS="zlib4pl.$SO" ZLIB_TARGETS="zlib4pl.$SO"
ZLIB_PLTARGETS='$(srcdir)/zlib.pl' ZLIB_PLTARGETS='$(srcdir)/zlib.pl'
ZLIB_INSTALL=install
else else
ZLIB_TARGETS=nolib ZLIB_TARGETS=nolib
ZLIB_INSTALL=nolib
cat << EOF cat << EOF
################################################################## ##################################################################
# ERROR: Could not find library zlib (-lz). Dropped library(zlib) # ERROR: Could not find library zlib (-lz). Dropped library(zlib)
@ -7378,6 +7386,7 @@ fi
# LAM # LAM
OLD_CC=${CC} OLD_CC=${CC}
CC=${LAM_MPI_CC} CC=${LAM_MPI_CC}

10
configure.in
View File

@ -138,6 +138,7 @@ AC_ARG_WITH(gmp,
else else
yap_cv_gmp=$with_gmp yap_cv_gmp=$with_gmp
LDFLAGS="$LDFLAGS -L${yap_cv_gmp}/lib" LDFLAGS="$LDFLAGS -L${yap_cv_gmp}/lib"
LIBS="$LIBS -L${yap_cv_gmp}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include" CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include"
CFLAGS="$CFLAGS -I${yap_cv_gmp}/include" CFLAGS="$CFLAGS -I${yap_cv_gmp}/include"
fi, fi,
@ -560,6 +561,11 @@ then
fi fi
AC_CHECK_LIB(psapi,main) AC_CHECK_LIB(psapi,main)
yap_cv_readline=no yap_cv_readline=no
if test "$target_win64" = yes
CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
then
CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
fi
if test "$prefix" = "NONE" if test "$prefix" = "NONE"
then then
if test "$target_win64" = yes if test "$target_win64" = yes
@ -568,7 +574,6 @@ then
CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32" CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
else else
prefix="\${SYSTEMDRIVE}/Yap" prefix="\${SYSTEMDRIVE}/Yap"
CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
fi fi
fi fi
ENABLE_WINCONSOLE="" ENABLE_WINCONSOLE=""
@ -1272,8 +1277,10 @@ AC_CHECK_LIB(z, zlibVersion,
if test "$ZLIB" = yes; then if test "$ZLIB" = yes; then
ZLIB_TARGETS="zlib4pl.$SO" ZLIB_TARGETS="zlib4pl.$SO"
ZLIB_PLTARGETS='$(srcdir)/zlib.pl' ZLIB_PLTARGETS='$(srcdir)/zlib.pl'
ZLIB_INSTALL=install
else else
ZLIB_TARGETS=nolib ZLIB_TARGETS=nolib
ZLIB_INSTALL=nolib
cat << EOF cat << EOF
################################################################## ##################################################################
# ERROR: Could not find library zlib (-lz). Dropped library(zlib) # ERROR: Could not find library zlib (-lz). Dropped library(zlib)
@ -1287,6 +1294,7 @@ fi
AC_SUBST(ZLIBS) AC_SUBST(ZLIBS)
AC_SUBST(ZLIB_TARGETS) AC_SUBST(ZLIB_TARGETS)
AC_SUBST(ZLIB_PLTARGETS) AC_SUBST(ZLIB_PLTARGETS)
AC_SUBST(ZLIB_INSTALL)
# LAM # LAM