diff --git a/DESCRIPTION b/DESCRIPTION index f0adf342367e11c04145793180221ee3152f12ff..93712412077adf4be80ef43b4f9c07379e0f989b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: glpkAPI Type: Package Title: R Interface to C API of GLPK -Version: 1.3.1 -Date: 2018-09-13 +Version: 1.3.2 +Date: 2020-02-13 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: 2018-09-13 14:05:00 UTC; mayo +Packaged: 2020-02-13 10:30:00 UTC; mayo NeedsCompilation: yes Repository: CRAN -Date/Publication: 2018-09-13 14:05:00 +Date/Publication: 2020-02-13 11:30:00 diff --git a/configure b/configure index a6599ebf91db2bab0497e342c471a84fecdef49d..31d474ea3977b4ebe92ea96fdb843dd356bce44e 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for glpkAPI 1.2.12. +# Generated by GNU Autoconf 2.69 for glpkAPI 1.3.2. # -# Report bugs to <geliudie@uni-duesseldorf.de>. +# Report bugs to <mayo.roettger@hhu.de>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -267,10 +267,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: geliudie@uni-duesseldorf.de about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." +$0: mayo.roettger@hhu.de 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 @@ -580,9 +580,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='glpkAPI' PACKAGE_TARNAME='glpkapi' -PACKAGE_VERSION='1.2.12' -PACKAGE_STRING='glpkAPI 1.2.12' -PACKAGE_BUGREPORT='geliudie@uni-duesseldorf.de' +PACKAGE_VERSION='1.3.2' +PACKAGE_STRING='glpkAPI 1.3.2' +PACKAGE_BUGREPORT='mayo.roettger@hhu.de' PACKAGE_URL='' # Factoring default headers for most tests. @@ -656,6 +656,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -730,6 +731,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}' @@ -982,6 +984,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=* \ @@ -1119,7 +1130,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. @@ -1232,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.2.12 to adapt to many kinds of systems. +\`configure' configures glpkAPI 1.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1272,6 +1283,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] @@ -1293,7 +1305,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of glpkAPI 1.2.12:";; + short | recursive ) echo "Configuration of glpkAPI 1.3.2:";; esac cat <<\_ACEOF @@ -1325,7 +1337,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <geliudie@uni-duesseldorf.de>. +Report bugs to <mayo.roettger@hhu.de>. _ACEOF ac_status=$? fi @@ -1388,7 +1400,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -glpkAPI configure 1.2.12 +glpkAPI configure 1.3.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1547,9 +1559,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------ ## -## Report this to geliudie@uni-duesseldorf.de ## -## ------------------------------------------ ##" +( $as_echo "## ----------------------------------- ## +## Report this to mayo.roettger@hhu.de ## +## ----------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -1757,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.2.12, which was +It was created by glpkAPI $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2117,7 +2129,6 @@ if test -z "${R_HOME}"; then fi CC=`"${R_HOME}/bin/R" CMD config CC` -CPP=`"${R_HOME}/bin/R" CMD config CPP` CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` ac_ext=c @@ -4166,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.2.12, which was +This file was extended by glpkAPI $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4222,13 +4233,13 @@ $config_files Configuration headers: $config_headers -Report bugs to <geliudie@uni-duesseldorf.de>." +Report bugs to <mayo.roettger@hhu.de>." _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.2.12 +glpkAPI config.status 1.3.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 2077c28b35fb66a34546810099220c264a7ca99c..5e4e0ea9d3d38ce8613c82838385ee3a19db4105 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([glpkAPI], [1.2.12], [geliudie@uni-duesseldorf.de]) +AC_INIT([glpkAPI], [1.3.2], [mayo.roettger@hhu.de]) dnl # -------------------------------------------------------------------- @@ -22,7 +22,6 @@ fi dnl # GNU R default settings CC=`"${R_HOME}/bin/R" CMD config CC` -CPP=`"${R_HOME}/bin/R" CMD config CPP` CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` AC_PROG_CC diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index 65f7d13ab107afea15328a934f813bf0a7078477..f105d72a3d7ee2563fd74e12d397a98def77af40 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.2 2020-02-13}{ + \itemize{ + \item Quick fix for CRAN issue: 'config' variable 'CPP' is deprecated. + } +} + % ---------------------------------------------------------------------------- % \section{Changes in version 1.3.1 2018-09-13}{ \itemize{