Cover 'yes/no' case fully from configure so no ifeq needed in make

Author: eddelbuettel

DESCRIPTION

@@ -12,7 +12,7 @@ VignetteBuilder: simplermarkdown
 LazyLoad: yes
 LinkingTo: Rcpp, BH
 Description: An R Interface to 'Bloomberg' is provided via the 'Blp API'.
-SystemRequirements: GNU make. A valid Bloomberg installation. The API headers and
+SystemRequirements: A valid Bloomberg installation. The API headers and
  dynamic library are downloaded from <https://github.com/Rblp/blp> during the
  build step. See <https://bloomberg.github.io/blpapi-docs/cpp/3.24.6> as well as
  <https://www.bloomberg.com/professional/support/api-library/> for API

configure

@@ -39,7 +39,7 @@ else
     echo "Check https://www.bloomberg.com/professional/support/api-library/ for possible support first."
     echo "Contributions welcome, see https://github.com/Rblp/blp for integration with Rblapi."
     echo "The build will proceed but not be functional for lack of a library."
-    sed -e"s/@have_blp@/no/" src/Makevars.in > src/Makevars
+    cp -ax src/Makevars.no_blp src/Makevars
     exit 0
 fi
 
@@ -66,7 +66,7 @@ else
     echo "Unsupported platform and architecture combination: ${platform} ${arch}."
     echo "The build will proceed but not be functional for lack of a library."
     echo "If you need such a combination please get in touch with the Blp vendor."
-    sed -e"s/@have_blp@/no/" src/Makevars.in > src/Makevars
+    cp -ax src/Makevars.no_blp src/Makevars
     exit 0
 fi
 

src/Makevars.in

@@ -20,30 +20,21 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with Rblpapi.  If not, see <http://www.gnu.org/licenses/>.
 
-## ------ Overall 'do we expect to have blp support available' state filled in by configure
+## Overall 'do we expect to have blp support available' state filled in by configure
 ##
+## (This variable is actually not used below and just left as a reminder 'how to' do
+## such replacements with `sed` from `configure`. The build with blp uses the same library
+## names throughout; we used to have 32 vs 64 bit builds in past.)
 HAVE_BLP = @have_blp@
 
-## ------ Case of blp support available
-##
-ifeq ($(HAVE_BLP), yes)
-
 ## this used to be filled in by configure but now both cases use the same value anyway
 BBG_LIB     = -lblpapi3_64
 BBG_RPATH   = '$$ORIGIN/../blp'
+
 ## set include and linker options
 ## Bbg API files are assummed to be in the standard search path
 PKG_CPPFLAGS = -I../inst/include/ -I. -DHaveBlp
 PKG_LIBS     = $(BBG_LIB) -L../inst/blp -Wl,-rpath,$(BBG_RPATH)
 
 all: $(SHLIB)
 	@if command -v install_name_tool; then echo "fixing"; install_name_tool -add_rpath @loader_path/../blp Rblpapi.so; fi
-
-
-## ------ Alternate case of no blp support on build platform
-else
-
-## use flag to compile without interfacing blp objects
-PKG_CPPFLAGS = -DNoBlpHere
-
-endif

src/Makevars.no_blp

@@ -0,0 +1,27 @@
+## -*- mode: makefile; -*-
+##
+##  Makefile -- Unix build system
+##
+##  Copyright (C) 2015-present  Dirk Eddelbuettel and Jeroen Ooms
+##  Copyright (C) 2022-present  Tomas Kalibera and Dirk Eddelbuettel
+##
+##  This file is part of Rblpapi
+##
+##  Rblpapi is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 2 of the License, or
+##  (at your option) any later version.
+##
+##  Rblpapi is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with Rblpapi.  If not, see <http://www.gnu.org/licenses/>.
+
+## The 'no blp' build does not require headers or linking: when no blp is
+## available, none is used: the build is 'naked'
+
+## use flag to compile without interfacing blp objects
+PKG_CPPFLAGS = -DNoBlpHere