From 05d914ab1aae06f3811df97a86c2714d9e2dfb69 Mon Sep 17 00:00:00 2001
From: Tomas Kalibera <tomas.kalibera@gmail.com>
Date: Tue, 25 Mar 2025 21:08:25 +0100
Subject: [PATCH 1/2] Use quantlib from the system when available via
 pkg-config.

---
 src/Makevars.win | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Makevars.win b/src/Makevars.win
index ad8a7e6..7eb3e4b 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -6,10 +6,17 @@
 # Copyright 2011         Uwe Ligges, Brian Ripley, and Josh Ulrich
 # Copyright 2018 - 2024  Jeroen Ooms
 
-RWINLIB=../windows/quantlib
-PKG_CPPFLAGS=-I$(RWINLIB)/include -I../inst/include
-PKG_CXXFLAGS=-DBOOST_NO_AUTO_PTR
-PKG_LIBS = -L$(RWINLIB)/lib$(R_ARCH) -L$(RWINLIB)/lib -lQuantLib
+PKG_CPPFLAGS = $(shell pkg-config --cflags quantlib 2>/dev/null)
+PKG_LIBS = $(shell pkg-config --libs quantlib 2>/dev/null)
+
+ifeq ($(PKG_LIBS),)
+  RWINLIB = ../windows/quantlib
+  PKG_CPPFLAGS = -I$(RWINLIB)/include
+  PKG_LIBS = -L$(RWINLIB)/lib$(R_ARCH) -L$(RWINLIB)/lib -lQuantLib
+endif
+
+PKG_CPPFLAGS += -I../inst/include
+PKG_CXXFLAGS = -DBOOST_NO_AUTO_PTR
 
 all: clean winlibs
 
@@ -17,4 +24,7 @@ clean:
 	rm -f $(SHLIB) $(OBJECTS)
 
 winlibs:
+ifneq ($(RWINLIB),)
 	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
+endif
+

From 302367cab95ff53cfddb5e8c9a0e572612cbaab0 Mon Sep 17 00:00:00 2001
From: Tomas Kalibera <tomas.kalibera@gmail.com>
Date: Tue, 25 Mar 2025 22:02:14 +0100
Subject: [PATCH 2/2] Mention src/Makevars.win in ChangeLog.

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d09db43..e811223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-03-25  Tomas Kalibera  <tomas.kalibera@gmail.com>
+
+	* src/Makevars.win: Preferentially use QuantLib from the system if
+	  found via pkg-config (prepare for upcoming Rtools)
+
 2025-03-24  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION (Version, Date): New release 0.4.25