Skip to content

Commit

Permalink
removed zstd as requirement
Browse files Browse the repository at this point in the history
  • Loading branch information
CreRecombinase committed Aug 25, 2018
1 parent 4403cd3 commit 17a7ca9
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 70 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Author: Nicholas Knoblauch
Maintainer: Nicholas Knoblauch <[email protected]>
Description: Read and write R objects using blosc+HDF5. Also contains a C++ interface for using with other packages. The C++ interface can handle the reading/writing/converting between column-major matrices (as in R/fortran) and row-major matrices (as in HDF5)
License: What license is it under?
Imports: Rcpp (>= 0.12.12), RcppEigen (>= 0.3.3.3.0),BH,dplyr,progress,tidyr,purrr,magrittr
LinkingTo: Rcpp, RcppEigen,BH,RcppProgress,testthat
Imports: Rcpp (>= 0.12.12), RcppEigen (>= 0.3.3.3.0),BH,dplyr,progress,tidyr,purrr,magrittr,zstdr
LinkingTo: Rcpp, RcppEigen,BH,RcppProgress,testthat,zstdr
SystemRequirements: C++11, HDF5 (>= 1.8.13), blosc, zstd
Suggests: testthat,
knitr,
Expand Down
76 changes: 13 additions & 63 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -751,6 +752,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
Expand Down Expand Up @@ -1003,6 +1005,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;

-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;

-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
Expand Down Expand Up @@ -1140,7 +1151,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
Expand Down Expand Up @@ -1293,6 +1304,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
Expand Down Expand Up @@ -4319,68 +4331,6 @@ fi
fi
if test -z "${ZSTD_LIBS}"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ZSTD_compress" >&5
$as_echo_n "checking for library containing ZSTD_compress... " >&6; }
if ${ac_cv_search_ZSTD_compress+:} 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 ZSTD_compress ();
int
main ()
{
return ZSTD_compress ();
;
return 0;
}
_ACEOF
for ac_lib in '' zstd; 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_ZSTD_compress=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_ZSTD_compress+:} false; then :
break
fi
done
if ${ac_cv_search_ZSTD_compress+:} false; then :
else
ac_cv_search_ZSTD_compress=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ZSTD_compress" >&5
$as_echo "$ac_cv_search_ZSTD_compress" >&6; }
ac_res=$ac_cv_search_ZSTD_compress
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
else
as_fn_error $? "unable to find the ZSTD_compress() function" "$LINENO" 5
fi
fi
Expand Down
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ if test -z "${BLOSC_LIBS}"; then
])
fi

if test -z "${ZSTD_LIBS}"; then
AC_SEARCH_LIBS([ZSTD_compress], [zstd], [], [
AC_MSG_ERROR([unable to find the ZSTD_compress() function])
])
fi
dnl if test -z "${ZSTD_LIBS}"; then
dnl AC_SEARCH_LIBS([ZSTD_compress], [zstd], [], [
dnl AC_MSG_ERROR([unable to find the ZSTD_compress() function])
dnl ])
dnl fi

dnl AC_SEARCH_LIBS([std::filesystem::path::path],[std++fs],[],[
dnl AC_MSG_ERROR([unable to find the c++ filesystem library])
Expand Down

0 comments on commit 17a7ca9

Please sign in to comment.