Skip to content

Refresh autoconf files, plus very minor edits to src/Makevars* #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eddelbuettel merged 1 commit into from
Jul 20, 2026
Merged

Refresh autoconf files, plus very minor edits to src/Makevars* #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
2026-07-20 Dirk Eddelbuettel <edd@debian.org>

* configure.ac: Refresh version list triggering 'outdated' message;
add test for local compilation using additional flags
* configure: Idem

* src/Makevars.in: Minor edits to comments
* src/Makevars.win: Idem

2026-07-14 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll micro release and date
Expand Down
19 changes: 16 additions & 3 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3375,16 +3375,16 @@ if test x"${QUANTLIB}" = x"yes" ; then
printf "%s\n" "$as_me: WARNING: RQuantLib requires QuantLib (>= 1.25)." >&2;}
as_fn_error $? "Please upgrade to a current version." "$LINENO" 5
;;
1.25.*|1.26*|1.27*|1.28*|1.29*|1.30.*|1.31.*|1.32.*|1.33.*|1.34.*)
1.25.*|1.26*|1.27*|1.28*|1.29*|1.30.*|1.31.*|1.32.*|1.33.*|1.34.*|1.35.*|1.36.*|1.37.*|1.38.*|1.39.*|1.40.*|1.41.*|1.42.*)
echo "checking for suitable QuantLib version... version ${pkg_version} is not the most recent one. Consider upgrading."
;;
1.*)
echo "checking for suitable QuantLib version... yes (${pkg_version})"
;;
esac

# now use all these
PKG_CXXFLAGS="${PKG_CXXFLAGS} ${pkg_cxxflags} ${gxx_newer_than_45}"
# now use both
PKG_CXXFLAGS="${PKG_CXXFLAGS} ${pkg_cxxflags}"

PKG_LIBS="${PKG_LIBS} $pkg_libs"

Expand Down Expand Up @@ -3528,6 +3528,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext



# Check if building locally
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for .git directory" >&5
printf %s "checking for .git directory... " >&6; }
if test -d "$srcdir/.git"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, adding extra flags" >&5
printf "%s\n" "yes, adding extra flags" >&6; }
#AC_SUBST([PKG_CXXFLAGS],["${PKG_CXXFLAGS} "-Wno-nonnull -Wno-maybe-uninitialized"])
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
# Action if directory is missing
fi




Expand Down
16 changes: 13 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ if test x"${QUANTLIB}" = x"yes" ; then
AC_MSG_WARN([RQuantLib requires QuantLib (>= 1.25).])
AC_MSG_ERROR([Please upgrade to a current version.])
;;
1.25.*|1.26*|1.27*|1.28*|1.29*|1.30.*|1.31.*|1.32.*|1.33.*|1.34.*)
1.25.*|1.26*|1.27*|1.28*|1.29*|1.30.*|1.31.*|1.32.*|1.33.*|1.34.*|1.35.*|1.36.*|1.37.*|1.38.*|1.39.*|1.40.*|1.41.*|1.42.*)
echo "checking for suitable QuantLib version... version ${pkg_version} is not the most recent one. Consider upgrading."
;;
1.*)
echo "checking for suitable QuantLib version... yes (${pkg_version})"
;;
esac

# now use all these
AC_SUBST([PKG_CXXFLAGS],["${PKG_CXXFLAGS} ${pkg_cxxflags} ${gxx_newer_than_45}"])
# now use both
AC_SUBST([PKG_CXXFLAGS],["${PKG_CXXFLAGS} ${pkg_cxxflags}"])
AC_SUBST([PKG_LIBS],["${PKG_LIBS} $pkg_libs"])

elif test "`uname`" = "Darwin" ; then
Expand Down Expand Up @@ -174,6 +174,16 @@ AC_DEFUN([QL_CHECK_BOOST],
])
QL_CHECK_BOOST

dnl # Check if building locally
dnl AC_MSG_CHECKING([for .git directory])
dnl if test -d "$srcdir/.git"; then
dnl AC_MSG_RESULT([yes, adding extra flags])
dnl #AC_SUBST([PKG_CXXFLAGS],["${PKG_CXXFLAGS} "-Wno-nonnull -Wno-maybe-uninitialized"])
dnl else
dnl AC_MSG_RESULT([no])
dnl # Action if directory is missing
dnl fi


AC_SUBST(PKG_CXXFLAGS)
AC_SUBST(PKG_LIBS)
Expand Down
5 changes: 1 addition & 4 deletions src/Makevars.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# -*- mode: Makefile -*-
#
# Copyright 2008 - 2024 Dirk Eddelbuettel
# Copyright 2008-2026 Dirk Eddelbuettel

# See configure.in for how these variables are computed
PKG_CXXFLAGS=@PKG_CXXFLAGS@ -I../inst/include -I. $(SHLIB_OPENMP_CXXFLAGS)
PKG_LIBS=@PKG_LIBS@ $(SHLIB_OPENMP_CXXFLAGS)

# Use C++14 with QuantLib 1.28 or later -- and the default with R 4.2.* anyway
#CXX_STD=CXX14
11 changes: 5 additions & 6 deletions src/Makevars.win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# -*- mode: Makefile -*-
#
# Copyright 2005 - 2006 Dominick Samperi
# Copyright 2005 Uwe Ligges
# Copyright 2008 - 2018 Dirk Eddelbuettel
# Copyright 2011 Uwe Ligges, Brian Ripley, and Josh Ulrich
# Copyright 2018 - 2024 Jeroen Ooms
# Copyright 2005-2006 Dominick Samperi
# Copyright 2005 Uwe Ligges
# Copyright 2008-2018 Dirk Eddelbuettel
# Copyright 2011 Uwe Ligges, Brian Ripley, and Josh Ulrich
# Copyright 2018-2024 Jeroen Ooms

PKG_CPPFLAGS = $(shell pkg-config --cflags quantlib 2>/dev/null)
PKG_LIBS = $(shell pkg-config --libs quantlib 2>/dev/null)
Expand All @@ -27,4 +27,3 @@ winlibs:
ifneq ($(RWINLIB),)
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
endif

Loading