Commit 126c6b5d authored by Jean-Francois Rey's avatar Jean-Francois Rey
Browse files

update autoconf version without deprecated macro

parent 17fc8b4b
Pipeline #4239 passed with stages
in 102 minutes and 40 seconds
......@@ -2,8 +2,8 @@ Package: landsepi
Type: Package
Encoding: UTF-8
Title: Landscape Epidemiology and Evolution
Version: 1.1.0.9999
Date: 2021-07-26
Version: 1.1.1
Date: 2021-10-05
Authors@R:
c(person(given = "Loup",
family = "Rimbaud",
......
......@@ -37,8 +37,8 @@
#' @details \tabular{ll}{
#' Package: \tab landsepi\cr
#' Type: \tab Package\cr
#' Version: \tab 1.1.0\cr
#' Date: \tab 2021-07-26\cr
#' Version: \tab 1.1.1\cr
#' Date: \tab 2021-10-5\cr
#' License: \tab GPL (>=2)\cr
#' }
#'
......
......@@ -266,10 +266,10 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
$0: jean-francois.rey@inrae.fr about your system, including
$0: any error possibly output before this message. Then
$0: install a modern shell, or manually run the script
$0: under such a shell if you do have one."
$0: jean-francois.rey@inrae.fr about your system, including any
$0: error possibly output before this message. Then install
$0: a modern shell, or manually run the script under such a
$0: shell if you do have one."
fi
exit 1
fi
......@@ -578,7 +578,7 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='landsepi'
PACKAGE_TARNAME='landsepi'
PACKAGE_TARNAME='the_package_name'
PACKAGE_VERSION='1.1.0'
PACKAGE_STRING='landsepi 1.1.0'
PACKAGE_BUGREPORT='jean-francois.rey@inrae.fr'
......@@ -1247,7 +1247,8 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/landsepi]
--docdir=DIR documentation root
[DATAROOTDIR/doc/the_package_name]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
......
......@@ -11,13 +11,13 @@ dnl -----------------------------------------------
dnl Package name and version number (user defined)
dnl -----------------------------------------------
define([THE_PACKAGE_NAME], [landsepi])
define([THE_PACKAGE_VERSION], [1.1.0])
define([THE_PACKAGE_VERSION], [1.1.1])
define([THE_PACKAGE_MAINTAINER], [jean-francois.rey@inrae.fr])
dnl --------------------------------
dnl Initialization macros.
dnl --------------------------------
AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_MAINTAINER)
AC_INIT([THE_PACKAGE_NAME],[THE_PACKAGE_VERSION],[THE_PACKAGE_MAINTAINER])
dnl -----------------------------------------------
dnl Checks for programs.
......@@ -43,7 +43,7 @@ AC_LANG(C++)
## debug mode for compiler code
AC_MSG_CHECKING([whether to build debug version])
AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [build debug version (default=no)]))
AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[build debug version (default=no)]))
if test "$enable_debug" != "yes" && test "$DEBUG" != TRUE ; then
AC_MSG_RESULT(no)
......
......@@ -16,8 +16,8 @@ resistance deployment strategies.
\tabular{ll}{
Package: \tab landsepi\cr
Type: \tab Package\cr
Version: \tab 1.1.0\cr
Date: \tab 2021-07-19\cr
Version: \tab 1.1.1\cr
Date: \tab 2021-10-5\cr
License: \tab GPL (>=2)\cr
}
......
......@@ -5,11 +5,6 @@
using namespace Rcpp;
#ifdef RCPP_USE_GLOBAL_ROSTREAM
Rcpp::Rostream<true>& Rcpp::Rcout = Rcpp::Rcpp_cout_get();
Rcpp::Rostream<false>& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get();
#endif
// model_landsepi
void model_landsepi(Rcpp::List time_param, Rcpp::NumericVector area_vector, Rcpp::NumericMatrix rotation_matrix, Rcpp::NumericMatrix croptypes_cultivars_prop, Rcpp::List dispersal, Rcpp::List inits, int seed, Rcpp::List cultivars_param, Rcpp::List basic_patho_param, Rcpp::List genes_param);
RcppExport SEXP _landsepi_model_landsepi(SEXP time_paramSEXP, SEXP area_vectorSEXP, SEXP rotation_matrixSEXP, SEXP croptypes_cultivars_propSEXP, SEXP dispersalSEXP, SEXP initsSEXP, SEXP seedSEXP, SEXP cultivars_paramSEXP, SEXP basic_patho_paramSEXP, SEXP genes_paramSEXP) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment