diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index 32358936d0b933fa577bc062610396a386202048..8e7869a3a1ebe7e8bc71ad83c4268a5fae6cb1c0
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
# ignore build r package:
sybil_*.tar.gz
+
+# ignore Mac OS X Finder databases:
+.DS_Store
+
diff --git a/DESCRIPTION b/DESCRIPTION
index 3693233e6f215f19603e9ec240c09a3ff43c48e5..4e942f99599bae63b48ae6cf2a1f1a2d0fac41c4 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: clpAPI
Type: Package
Title: R Interface to C API of COIN-OR Clp
-Version: 1.2.9
-Date: 2018-09-24
+Version: 1.2.10
+Date: 2019-05-23
Authors@R: c(person("Mayo", "Roettger", role = "cre", email = "mayo.roettger@hhu.de"),
person("Gabriel", "Gelius-Dietrich", role = c("aut"), email = "geliudie@uni-duesseldorf.de"),
person(c("C.", "Jonathan"), "Fritzemeier", role = "ctb", email = "clausjonathan.fritzemeier@uni-duesseldorf.de"))
@@ -13,9 +13,9 @@ SystemRequirements: COIN-OR Clp (>= 1.12.0)
License: GPL-3 | file LICENSE
LazyLoad: yes
Collate: generics.R clp_ptrClass.R clp.R clpAPI.R zzz.R
-Packaged: 2018-09-24 11:34:00 UTC; mayo
+Packaged: 2019-05-23 11:07:00 UTC; mayo
Author: Mayo Roettger [cre], Gabriel Gelius-Dietrich [aut], C. Jonathan Fritzemeier [ctb]
Maintainer: Mayo Roettger <mayo.roettger@hhu.de>
NeedsCompilation: yes
Repository: CRAN
-Date/Publication: 2018-09-24 11:34:00
+Date/Publication: 2019-05-23 11:07:00
diff --git a/cleanup b/cleanup
index f34a53809d37aca8301396494144252c2bc48bca..52624c3c2c7d1adacdba327eecc78ad127f8ddb6 100755
--- a/cleanup
+++ b/cleanup
@@ -1,4 +1,5 @@
#! /bin/sh
rm -rf autom4te.cache src/Makevars src/*.o
+rm -rf .DS_Store
exit 0
diff --git a/configure b/configure
index 5ca8a22d1ea69950e131590b8833701a36fdaa31..e809700b471c9bca5772727174fd819681a25736 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 clpAPI 1.2.6.
+# Generated by GNU Autoconf 2.69 for clpAPI 1.2.10.
#
-# 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='clpAPI'
PACKAGE_TARNAME='clpapi'
-PACKAGE_VERSION='1.2.6'
-PACKAGE_STRING='clpAPI 1.2.6'
-PACKAGE_BUGREPORT='geliudie@uni-duesseldorf.de'
+PACKAGE_VERSION='1.2.10'
+PACKAGE_STRING='clpAPI 1.2.10'
+PACKAGE_BUGREPORT='mayo.roettger@hhu.de'
PACKAGE_URL=''
# Factoring default headers for most tests.
@@ -657,6 +657,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -729,6 +730,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}'
@@ -981,6 +983,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=* \
@@ -1118,7 +1129,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.
@@ -1231,7 +1242,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 clpAPI 1.2.6 to adapt to many kinds of systems.
+\`configure' configures clpAPI 1.2.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1271,6 +1282,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]
@@ -1292,7 +1304,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of clpAPI 1.2.6:";;
+ short | recursive ) echo "Configuration of clpAPI 1.2.10:";;
esac
cat <<\_ACEOF
@@ -1317,7 +1329,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
@@ -1380,7 +1392,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-clpAPI configure 1.2.6
+clpAPI configure 1.2.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1539,9 +1551,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
@@ -1682,7 +1694,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 clpAPI $as_me 1.2.6, which was
+It was created by clpAPI $as_me 1.2.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3560,7 +3572,26 @@ fi
done
-ac_fn_c_check_header_mongrel "$LINENO" "Clp_C_Interface.h" "ac_cv_header_Clp_C_Interface_h" "$ac_includes_default"
+for ac_header in stdbool.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdbool_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_STDBOOL_H 1
+_ACEOF
+
+else
+ as_fn_error $? "Could not find stdbool.h" "$LINENO" 5
+fi
+
+done
+
+
+ac_fn_c_check_header_compile "$LINENO" "Clp_C_Interface.h" "ac_cv_header_Clp_C_Interface_h" "#ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>
+ #endif
+
+"
if test "x$ac_cv_header_Clp_C_Interface_h" = xyes; then :
else
@@ -3571,7 +3602,6 @@ fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing Clp_newModel" >&5
$as_echo_n "checking for library containing Clp_newModel... " >&6; }
if ${ac_cv_search_Clp_newModel+:} false; then :
@@ -4181,7 +4211,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 clpAPI $as_me 1.2.6, which was
+This file was extended by clpAPI $as_me 1.2.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4228,13 +4258,13 @@ Usage: $0 [OPTION]... [TAG]...
Configuration files:
$config_files
-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="\\
-clpAPI config.status 1.2.6
+clpAPI config.status 1.2.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index a7b1946f99467d526606a6cb3dbf18e01e7ce8b4..be2d9f1aced717d5c190fac31c1854bbfe7b5a2a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([clpAPI], [1.2.6], [geliudie@uni-duesseldorf.de])
+AC_INIT([clpAPI], [1.2.10], [mayo.roettger@hhu.de])
dnl # --------------------------------------------------------------------
dnl # global (environment) variables
@@ -236,11 +236,17 @@ LIBS="${PKG_LIBS}"
CFLAGS="${CFLAGS} ${PKG_CFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PKG_CPPFLAGS}"
+AC_CHECK_HEADERS([stdbool.h],,
+ AC_MSG_ERROR([Could not find stdbool.h]))
+
AC_CHECK_HEADER([Clp_C_Interface.h],,
AC_MSG_ERROR([Could not find Clp_C_Interface.h:
clpAPI requires clp from http://www.coin-or.org/projects/Clp.xml
- use --with-clp-include or CLP_INCLUDE to specify the include path.]))
-
+ use --with-clp-include or CLP_INCLUDE to specify the include path.]),
+ [#ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>
+ #endif
+ ])
AC_SEARCH_LIBS([Clp_newModel], [Clp], ,
AC_MSG_ERROR([Could not link to clp:
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
index 59dc2b22dd56e7ef7a2bc121aaf333d4117c272e..c92a5846e1f9a74428f4c5a8007e2548f7ffba87 100755
--- a/inst/NEWS.Rd
+++ b/inst/NEWS.Rd
@@ -3,6 +3,14 @@
\name{NEWS}
\title{clpAPI News}
\encoding{UTF-8}
+% ---------------------------------------------------------------------------- %
+\section{Changes in version 1.2.10 2019-05-23}{
+ \itemize{
+ \item changed configure script to build with Clp version 1.17.2,
+ now requiring stdbool.h.
+ }
+}
+
% ---------------------------------------------------------------------------- %
\section{Changes in version 1.2.9 2018-09-24}{
\itemize{
diff --git a/src/clpR.h b/src/clpR.h
index 5e61acfae9b5bd153ba9ec2fe1ba26b087a74e76..b8ef2acfdcc5674af43a9f73f8a594b39e754c6a 100755
--- a/src/clpR.h
+++ b/src/clpR.h
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <Clp_C_Interface.h>
#include <ClpConfig.h>