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

Merge /home/vsc/git/yap-6.3

This commit is contained in:
Vitor Santos Costa 2014-02-11 13:32:18 +00:00
parent 9b00f3700c 365dcd5bca
commit 88c2839b36
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure.in
View File

@ -623,22 +623,22 @@ CMFLAGS=-fpic
CIFLAGS=-I.
if test "$use_prism" = no; then
PKG_PRISM="@# "
else
PKG_PRISM=""
else
PKG_PRISM="packages/prism/src/c packages/prism/src/prolog"
fi
AC_SUBST(PKG_PRISM)
if test -e "$srcdir"/packages/archive/Makefile.in; then
PKG_LIBARCHIVE=""
PKG_LIBARCHIVE="packages/archive"
else
PKG_LIBARCHIVE="@# "
PKG_LIBARCHIVE=""
fi
if test -e "$srcdir"/packages/odbc/Makefile.in; then
PKG_ODBC=""
PKG_ODBC="packages/odbc"
else
PKG_ODBC="@# "
PKG_ODBC=""
fi
if test "$use_chr" = no; then
@ -1743,32 +1743,32 @@ fi
m4_include([packages/myddas/configure.in])
if test "$PKG_CLIB" = ""
if test "$PKG_CLIB" != ""
then
m4_include([packages/clib/configure.in])
fi
if test "$PKG_LIBARCHIVE" = ""
if test "$PKG_LIBARCHIVE" != ""
then
m4_include([packages/archive/configure.in])
if test "$ARCHIVE_TARGETS" = "nolib"
then
PKG_LIBARCHIVE="@# "
PKG_LIBARCHIVE=""
fi
fi
if test "$PKG_ODBC" = ""; then
if test "$PKG_ODBC" != ""; then
m4_include([packages/odbc/configure.in])
if test "$ODBC_TARGETS" = "nolib"
then
PKG_ODBC="@# "
PKG_ODBC=""
fi
else
@ -1780,14 +1780,14 @@ fi
m4_include([packages/bdd/configure.in])
dnl zlib
if test "$PKG_ZLIB" = ""
if test "$PKG_ZLIB" != ""
then
m4_include([packages/zlib/configure.in])
if test "$ZLIB_TARGETS" = "nolib"
then
PKG_ZLIB="@# "
PKG_ZLIB=""
fi
fi

2
packages/clib

@ -1 +1 @@
Subproject commit f9c9a5e10f84c2c0238a8338ef7ac3f93886c30d
Subproject commit ab6b1a70db5dfaf6467b7d4ab51cfa76f1352d4c

2
packages/jpl

@ -1 +1 @@
Subproject commit e111442b428bcaac015d9545e42faf97df6b30f4
Subproject commit f96cfb7533c57789fa25db64b73c09aa7269d244

2
packages/pldoc

@ -1 +1 @@
Subproject commit 34ef10c71d1577dcde1e5437949cc202638ed671
Subproject commit 1e324d30b913edbe78cc4b923cde7998013cbfb0

2
packages/real

@ -1 +1 @@
Subproject commit e8360ba2db265175a3b469bc9d51aff5cfccabb0
Subproject commit 6235790ec8283ca65aefaed14f95a1749e744325