diff --git a/DESCRIPTION b/DESCRIPTION index 93712412077adf4be80ef43b4f9c07379e0f989b..56a489a6bb500e8cb59e01c1d2994d0b4ddd81ed 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: glpkAPI Type: Package Title: R Interface to C API of GLPK -Version: 1.3.2 -Date: 2020-02-13 +Version: 1.3.3 +Date: 2021-10-28 Authors@R: c(person("Mayo", "Roettger", email = "mayo.roettger@hhu.de", role = "cre"), person("Gabriel", "Gelius-Dietrich", role = "aut", email = "geliudie@uni-duesseldorf.de"), person("Louis", "Luangkesorn", email = "lugerpitt@gmail.com", role = "ctb" )) @@ -13,7 +13,7 @@ SystemRequirements: GLPK (>= 4.42) License: GPL-3 LazyLoad: yes Collate: generics.R glpk_ptrClass.R glpk.R glpkAPI.R zzz.R -Packaged: 2020-02-13 10:30:00 UTC; mayo +Packaged: 2021-10-28 12:10:00 UTC; mayo NeedsCompilation: yes Repository: CRAN -Date/Publication: 2020-02-13 11:30:00 +Date/Publication: 2021-10-28 14:10:00 diff --git a/configure b/configure index 31d474ea3977b4ebe92ea96fdb843dd356bce44e..065cfc4493543ac6013794b9a9de19ec4095ded7 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for glpkAPI 1.3.2. +# Generated by GNU Autoconf 2.69 for glpkAPI 1.3.3. # # Report bugs to <mayo.roettger@hhu.de>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='glpkAPI' PACKAGE_TARNAME='glpkapi' -PACKAGE_VERSION='1.3.2' -PACKAGE_STRING='glpkAPI 1.3.2' +PACKAGE_VERSION='1.3.3' +PACKAGE_STRING='glpkAPI 1.3.3' PACKAGE_BUGREPORT='mayo.roettger@hhu.de' PACKAGE_URL='' @@ -1243,7 +1243,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures glpkAPI 1.3.2 to adapt to many kinds of systems. +\`configure' configures glpkAPI 1.3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1305,7 +1305,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of glpkAPI 1.3.2:";; + short | recursive ) echo "Configuration of glpkAPI 1.3.3:";; esac cat <<\_ACEOF @@ -1400,7 +1400,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -glpkAPI configure 1.3.2 +glpkAPI configure 1.3.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1769,7 +1769,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by glpkAPI $as_me 1.3.2, which was +It was created by glpkAPI $as_me 1.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4177,7 +4177,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by glpkAPI $as_me 1.3.2, which was +This file was extended by glpkAPI $as_me 1.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4239,7 +4239,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -glpkAPI config.status 1.3.2 +glpkAPI config.status 1.3.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5e4e0ea9d3d38ce8613c82838385ee3a19db4105..1823b5a18dc6459c3434ede3d88d65e47c67d483 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([glpkAPI], [1.3.2], [mayo.roettger@hhu.de]) +AC_INIT([glpkAPI],[1.3.3],[mayo.roettger@hhu.de]) dnl # -------------------------------------------------------------------- @@ -55,29 +55,25 @@ dnl # get arguments dnl # -------------------------------------------------------------------- AC_ARG_WITH(glpk-include, - AC_HELP_STRING([--with-glpk-include=PATH], - [location of glpk include directory [[/usr/local/include]]] - ), + AS_HELP_STRING([--with-glpk-include=PATH],[location of glpk include directory [[/usr/local/include]] + ]), [GLPK_INCLUDE=$withval], [GLPK_INCLUDE=""]) AC_ARG_WITH(glpk-lib, - AC_HELP_STRING([--with-glpk-lib=PATH], - [location of GLPK callable library [[/usr/local/lib]]] - ), + AS_HELP_STRING([--with-glpk-lib=PATH],[location of GLPK callable library [[/usr/local/lib]] + ]), [GLPK_LIB=$withval], [GLPK_LIB=""]) AC_ARG_ENABLE(gmp, - AC_HELP_STRING([--enable-gmp[=yes|no]], - [link to GNU bignum library libgmp [[yes]]] - ), + AS_HELP_STRING([--enable-gmp[=yes|no]],[link to GNU bignum library libgmp [[yes]] + ]), [GMP=$enableval], [GMP="yes"]) AC_ARG_ENABLE(chkargs, - AC_HELP_STRING([--enable-chkargs[=yes|no]], - [check arguments to GLPK [[yes]]] - ), + AS_HELP_STRING([--enable-chkargs[=yes|no]],[check arguments to GLPK [[yes]] + ]), [CHKARGS=$enableval], [CHKARGS="yes"]) @@ -238,6 +234,7 @@ dnl # -------------------------------------------------------------------- AC_SUBST(PKG_CFLAGS) AC_SUBST(PKG_LIBS) AC_SUBST(PKG_CPPFLAGS) -AC_OUTPUT(src/Makevars) +AC_CONFIG_FILES([src/Makevars]) +AC_OUTPUT exit 0 diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index f105d72a3d7ee2563fd74e12d397a98def77af40..9b9adc913257d9f0a3c316c59d61c8d205bc907a 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -4,6 +4,13 @@ \title{glpkAPI News} \encoding{UTF-8} +% ---------------------------------------------------------------------------- % +\section{Changes in version 1.3.3 2021-10-28}{ + \itemize{ + \item Fix for CRAN issue concerning deprecated autoconf macros. + } +} + % ---------------------------------------------------------------------------- % \section{Changes in version 1.3.2 2020-02-13}{ \itemize{ diff --git a/src/config.h.in b/src/config.h.in index 6c94579cdf2562f1a754dffb14447050b70e8b3f..4910432829444aa58f24b55f6c974a8d83fde782 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,9 +1,55 @@ -/* config.h.in (glpkAPI configuration template file) */ +/* src/config.h.in. Generated from configure.ac by autoheader. */ +/* defined, if check arguments to GLPK */ #undef CHECK_GLPK_ARGS -/* defined, if arguments to GLPK should be checked */ -#undef USE_GMP -/* defined, if gnu bignum is used */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H -/* eof */ +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* defined, if gnu bignum is used */ +#undef USE_GMP