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

odbc and archive

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-10-23 00:45:13 +01:00
parent f189784510
commit b272205707
6 changed files with 228 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -715,6 +715,7 @@ all: startup.yss
@ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE))
@ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE))
@ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE))
@ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE))
@ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE))
@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE))
@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE))
@ -788,6 +789,7 @@ install_unix: startup.yss libYap.a
@ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE) install)
@ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@)
@ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE) install)
@ENABLE_LIBODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE) install)
@ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE) install)
@ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)

23
config.h.in
View File

@ -340,6 +340,29 @@
#define HAVE_MPE 0
#endif
/* libarchive */
#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_BZIP2
#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_COMPRESS
#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_GZIP
#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_LZMA
#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_NONE
#undef HAVE_ARCHIVE_READ_SUPPORT_COMPRESSION_XZ
#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_AR
#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_CPIO
#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_EMPTY
#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_ISO9660
#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_MTREE
#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_RAW
#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_TAR
#undef HAVE_ARCHIVE_READ_SUPPORT_FORMAT_ZIP
/* SQL and ODBC support */
#undef HAVE_SQL_H
#undef HAVE_GMTIME
#undef HAVE_TIMEGM
#undef HAVE_SQLLEN
#undef HAVE_SQLULEN
/* should we avoid realloc() in mpi.c? */
#define MPI_AVOID_REALLOC 0

154
configure vendored
View File

@ -621,6 +621,12 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
ENABLE_ODBC
ODBC_PLTARGETS
ODBC_TARGETS
ODBC_LIBS
ODBC_LDFLAGS
ODBC_CFLAGS
ENABLE_LIBARCHIVE
ARCHIVE_PLTARGETS
ARCHIVE_TARGETS
@ -4744,6 +4750,8 @@ if test "${enable_myddas+set}" = set; then :
yap_cv_myddas=$enable_myddas
LDFLAGS="$LDFLAGS -L${yap_cv_myddas}/lib "
CPPFLAGS="$CPPFLAGS -I${yap_cv_myddas}/include "
ODBC_LDFLAGS="-L${yap_cv_myddas}/lib "
ODBC_CFLAGS="-I${yap_cv_myddas}/include "
fi
else
yap_cv_myddas=/usr
@ -7031,6 +7039,73 @@ else
yap_cv_odbc="no"
fi
if test "$yap_cv_odbc" = yes
then
ODBC_LIBS="$ODBC_LIBS -lodbc"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SQLAllocHandle" >&5
$as_echo_n "checking for library containing SQLAllocHandle... " >&6; }
if ${ac_cv_search_SQLAllocHandle+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char SQLAllocHandle ();
int
main ()
{
return SQLAllocHandle ();
;
return 0;
}
_ACEOF
for ac_lib in '' iodbc; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_SQLAllocHandle=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_SQLAllocHandle+:} false; then :
break
fi
done
if ${ac_cv_search_SQLAllocHandle+:} false; then :
else
ac_cv_search_SQLAllocHandle=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SQLAllocHandle" >&5
$as_echo "$ac_cv_search_SQLAllocHandle" >&6; }
ac_res=$ac_cv_search_SQLAllocHandle
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
yap_cv_odbc="yes"
else
yap_cv_odbc="no"
fi
if test "$yap_cv_odbc" = yes
then
ODBC_LIBS="$ODBC_LIBS -liodbc"
fi
fi
if test "$yap_cv_odbc" = yes
then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC"
@ -7517,6 +7592,12 @@ else
ENABLE_LIBARCHIVE="@# "
fi
if test -e "$srcdir"/packages/odbc/Makefile.in; then
ENABLE_ODBC=""
else
ENABLE_ODBC="@# "
fi
if test "$use_chr" = no; then
ENABLE_CHR="@# "
elif test -e "$srcdir"/packages/chr/Makefile.in; then
@ -10933,6 +11014,63 @@ fi
fi
if test "$yap_cv_odbc" = yes; then
ODBC_TARGETS="odbc4pl.$SO"
ODBC_PLTARGETS=odbc.pl
for ac_header in sql.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default"
if test "x$ac_cv_header_sql_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SQL_H 1
_ACEOF
fi
done
for ac_func in localtime mktime gmtime timegm
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
ac_fn_c_check_type "$LINENO" "SQLLEN" "ac_cv_type_SQLLEN" "#include <sql.h>
"
if test "x$ac_cv_type_SQLLEN" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SQLLEN 1
_ACEOF
fi
ac_fn_c_check_type "$LINENO" "SQLULEN" "ac_cv_type_SQLULEN" "#include <sql.h>
"
if test "x$ac_cv_type_SQLULEN" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SQLULEN 1
_ACEOF
fi
else
ODBC_TARGETS=nolib
ODBC_PLTARGETS=odbc.pl
fi
if test "$ENABLE_LIBARCHIVE" = ""
then
OLD_LIBS=$LIBS
@ -10996,6 +11134,7 @@ fi
fi
LIBS="$LIBS -larchive"
for ac_func in archive_read_support_compression_bzip2 \
archive_read_support_compression_compress \
archive_read_support_compression_gzip \
@ -11060,10 +11199,19 @@ fi
LIBS="$OLD_LIBS"
fi
mkdir -p library/lammpi
mkdir -p library/matrix
mkdir -p library/matlab
@ -11252,6 +11400,11 @@ ac_config_files="$ac_config_files packages/archive/Makefile"
fi
if test "$ENABLE_ODBC" = ""; then
ac_config_files="$ac_config_files packages/odbc/Makefile"
fi
if test "$ENABLE_CUDD" = ""; then
ac_config_files="$ac_config_files packages/bdd/Makefile"
@ -12028,6 +12181,7 @@ do
"packages/sgml/Makefile") CONFIG_FILES="$CONFIG_FILES packages/sgml/Makefile" ;;
"packages/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES packages/zlib/Makefile" ;;
"packages/archive/Makefile") CONFIG_FILES="$CONFIG_FILES packages/archive/Makefile" ;;
"packages/odbc/Makefile") CONFIG_FILES="$CONFIG_FILES packages/odbc/Makefile" ;;
"packages/bdd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/bdd/Makefile" ;;
"packages/ProbLog/simplecudd/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd/Makefile" ;;
"packages/ProbLog/simplecudd_lfi/Makefile") CONFIG_FILES="$CONFIG_FILES packages/ProbLog/simplecudd_lfi/Makefile" ;;

54
configure.in
View File

@ -282,6 +282,8 @@ AC_ARG_ENABLE(myddas,
yap_cv_myddas=$enable_myddas
LDFLAGS="$LDFLAGS -L${yap_cv_myddas}/lib "
CPPFLAGS="$CPPFLAGS -I${yap_cv_myddas}/include "
ODBC_LDFLAGS="-L${yap_cv_myddas}/lib "
ODBC_CFLAGS="-I${yap_cv_myddas}/include "
fi,
[yap_cv_myddas=/usr])
@ -888,9 +890,15 @@ then
;;
esac
AC_SEARCH_LIBS(SQLAllocHandle, [odbc], [yap_cv_odbc="yes"], [yap_cv_odbc="no"])
if test "$yap_cv_odbc" = no
if test "$yap_cv_odbc" = yes
then
ODBC_LIBS="$ODBC_LIBS -lodbc"
else
AC_SEARCH_LIBS(SQLAllocHandle, [iodbc], [yap_cv_odbc="yes"], [yap_cv_odbc="no"])
if test "$yap_cv_odbc" = yes
then
ODBC_LIBS="$ODBC_LIBS -liodbc"
fi
fi
if test "$yap_cv_odbc" = yes
then
@ -907,11 +915,6 @@ then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_TOP_LEVEL"
fi
AC_CHECK_HEADERS(sql.h)
AC_CHECK_FUNCS(localtime mktime gmtime timegm)
AC_CHECK_TYPES([SQLLEN, SQLULEN],,,
[#include <sql.h>
])
fi
if test "$yap_cv_cudd" != no; then
@ -1016,6 +1019,12 @@ else
ENABLE_LIBARCHIVE="@# "
fi
if test -e "$srcdir"/packages/odbc/Makefile.in; then
ENABLE_ODBC=""
else
ENABLE_ODBC="@# "
fi
if test "$use_chr" = no; then
ENABLE_CHR="@# "
elif test -e "$srcdir"/packages/chr/Makefile.in; then
@ -2349,14 +2358,29 @@ else
EOF
fi
AC_SUBST(ZLIBS)
AC_SUBST(ZLIB_TARGETS)
AC_SUBST(ZLIB_PLTARGETS)
AC_SUBST(ZLIB_INSTALL)
fi
dnl zlib
dnl archive
if test "$yap_cv_odbc" = yes; then
ODBC_TARGETS="odbc4pl.$SO"
ODBC_PLTARGETS=odbc.pl
AC_CHECK_HEADERS(sql.h)
AC_CHECK_FUNCS(localtime mktime gmtime timegm)
AC_CHECK_TYPES([SQLLEN, SQLULEN],,,
[#include <sql.h>
])
else
ODBC_TARGETS=nolib
ODBC_PLTARGETS=odbc.pl
fi
if test "$ENABLE_LIBARCHIVE" = ""
then
OLD_LIBS=$LIBS
@ -2375,6 +2399,7 @@ if test "$ARCHIVEH" = yes; then
ARCHIVELIB=no)
fi
LIBS="$LIBS -larchive"
AC_CHECK_FUNCS(archive_read_support_compression_bzip2 \
archive_read_support_compression_compress \
archive_read_support_compression_gzip \
@ -2417,10 +2442,19 @@ AC_SUBST(ARCHIVE_LIBS)
AC_SUBST(ARCHIVE_TARGETS)
AC_SUBST(ARCHIVE_PLTARGETS)
LIBS="$OLD_LIBS"
fi
AC_SUBST(ENABLE_LIBARCHIVE)
AC_SUBST(ODBC_CFLAGS)
AC_SUBST(ODBC_LDFLAGS)
AC_SUBST(ODBC_LIBS)
AC_SUBST(ODBC_TARGETS)
AC_SUBST(ODBC_PLTARGETS)
AC_SUBST(ENABLE_ODBC)
mkdir -p library/lammpi
mkdir -p library/matrix
mkdir -p library/matlab
@ -2567,6 +2601,10 @@ if test "$ENABLE_LIBARCHIVE" = ""; then
AC_CONFIG_FILES([packages/archive/Makefile])
fi
if test "$ENABLE_ODBC" = ""; then
AC_CONFIG_FILES([packages/odbc/Makefile])
fi
if test "$ENABLE_CUDD" = ""; then
AC_CONFIG_FILES([packages/bdd/Makefile])

2
packages/archive

@ -1 +1 @@
Subproject commit 21c3bdd3765fb666d27c127eea53e3fb8c572dae
Subproject commit 4445c093d08d0693899d8f3a3ac1b0842370d868

2
packages/odbc

@ -1 +1 @@
Subproject commit bb9bee7ac5f9c5dd793adfde41215d9184833961
Subproject commit 761bb9831f7221207949176de729711d0018e511