[Pkg-electronics-commits] [gnucap] 10/43: get rid of stringize.

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository gnucap.

commit b5b726eba3b8293fbf7445472d840a2055305904
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Mar 21 12:03:48 2017 +0000

    get rid of stringize.
    
    put default GNUCAP_PLUGPATH, just in case.
---
 include/patchlev.h | 2 +-
 main/configure     | 2 +-
 main/main.cc       | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/patchlev.h b/include/patchlev.h
index 1476db8..c3b9b80 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "plugpath-3c 2017.03.12"
+#define PATCHLEVEL "plugpath-3c 2017.03.21"
diff --git a/main/configure b/main/configure
index d98988b..43469c7 100755
--- a/main/configure
+++ b/main/configure
@@ -58,7 +58,7 @@ TARGET_EXT =
 LDFLAGS = -rdynamic \
 -L../../lib/O
 
-CONF_CPPFLAGS=-DGNUCAP_PLUGPATH="\$(PREFIX)/lib/gnucap"
+CONF_CPPFLAGS=-DGNUCAP_PLUGPATH="\"\$(PREFIX)/lib/gnucap\""
 
 .SUFFIXES : .o .cc
 .cc.o:; \$(CCC) \$(CXXFLAGS) \$(CONF_CPPFLAGS) \$(CPPFLAGS) \$(CCFLAGS) -c \$<
diff --git a/main/main.cc b/main/main.cc
index dc6be9c..fc5c4f3 100644
--- a/main/main.cc
+++ b/main/main.cc
@@ -33,8 +33,9 @@
 #include "c_comand.h"
 #include "declare.h"	/* plclose */
 /*--------------------------------------------------------------------------*/
-#define STRINGIZE(x) #x
-#define STRINGIZE_VALUE_OF(x) STRINGIZE(x)
+#ifndef GNUCAP_PLUGPATH
+# define GNUCAP_PLUGPATH "/usr/local/lib/gnucap"
+#endif
 /*--------------------------------------------------------------------------*/
 struct JMP_BUF{
   sigjmp_buf p;
@@ -57,7 +58,7 @@ static void sign_on(void)
 /*--------------------------------------------------------------------------*/
 static void prepare_env()
 {
-  static std::string plugpath("PLUGPATH=" STRINGIZE_VALUE_OF(GNUCAP_PLUGPATH)
+  static std::string plugpath("PLUGPATH=" GNUCAP_PLUGPATH
                               "\0         (reserved space)                 ");
 
   std::string ldlpath = OS::getenv("LD_LIBRARY_PATH");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git