Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glpkapi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
general
ccb
glpkapi
Commits
46eed2d5
Commit
46eed2d5
authored
3 years ago
by
Mayo
Browse files
Options
Downloads
Patches
Plain Diff
Fix for CRAN issue concerning deprecated autoconf macros
parent
0785a2d5
No related branches found
No related tags found
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
DESCRIPTION
+4
-4
4 additions, 4 deletions
DESCRIPTION
configure
+9
-9
9 additions, 9 deletions
configure
configure.ac
+11
-14
11 additions, 14 deletions
configure.ac
inst/NEWS.Rd
+7
-0
7 additions, 0 deletions
inst/NEWS.Rd
src/config.h.in
+51
-5
51 additions, 5 deletions
src/config.h.in
with
82 additions
and
32 deletions
DESCRIPTION
+
4
−
4
View file @
46eed2d5
Package: glpkAPI
Type: Package
Title: R Interface to C API of GLPK
Version: 1.3.
2
Date: 202
0-02-13
Version: 1.3.
3
Date: 202
1-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: 202
0-02-13 10:3
0:00 UTC; mayo
Packaged: 202
1-10-28 12:1
0:00 UTC; mayo
NeedsCompilation: yes
Repository: CRAN
Date/Publication: 202
0-02-13 11:3
0:00
Date/Publication: 202
1-10-28 14:1
0:00
This diff is collapsed.
Click to expand it.
configure
+
9
−
9
View file @
46eed2d5
#! /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
\\
"
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
11
−
14
View file @
46eed2d5
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
This diff is collapsed.
Click to expand it.
inst/NEWS.Rd
+
7
−
0
View file @
46eed2d5
...
...
@@ -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{
...
...
This diff is collapsed.
Click to expand it.
src/config.h.in
+
51
−
5
View file @
46eed2d5
/* 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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment