[Pkg-electronics-commits] [gnucap] 13/43: create&use main/config.h

[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 b37872ca9462012f3b7af924c19cc9f6d02c00f6
Author: Felix Salfelder <felix at salfelder.org>
Date:   Fri Mar 24 20:24:18 2017 +0000

    create&use main/config.h
---
 main/Make.depend |  2 +-
 main/config.h.in |  6 ++++++
 main/configure   | 12 +++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/main/Make.depend b/main/Make.depend
index 497c3d8..8989850 100644
--- a/main/Make.depend
+++ b/main/Make.depend
@@ -1,4 +1,4 @@
-main.o: main.cc ../include/globals.h ../include/l_dispatcher.h \
+main.o: main.cc ../config.h ../include/globals.h ../include/l_dispatcher.h \
  ../include/e_base.h ../include/md.h ../include/io_trace.h \
  ../include/io_error.h ../include/l_stlextra.h ../include/u_opt.h \
  ../include/mode.h ../include/io_.h ../include/l_lib.h ../include/ap.h \
diff --git a/main/config.h.in b/main/config.h.in
new file mode 100644
index 0000000..07b1810
--- /dev/null
+++ b/main/config.h.in
@@ -0,0 +1,6 @@
+#ifndef GNUCAP_MAIN_CONFIG_H
+#define GNUCAP_MAIN_CONFIG_H
+
+#define GNUCAP_PLUGPATH "@pkglibdir@"
+
+#endif
diff --git a/main/configure b/main/configure
index 43469c7..e291ba1 100755
--- a/main/configure
+++ b/main/configure
@@ -29,6 +29,7 @@ pkglibdir=$prefix/lib
 # bug. this is not implemented consistently.
 CXX=${CXX-g++}
 
+fill_template() {
 sed -e "s#@prefix@#$prefix#" \
     -e "s#@exec_prefix@#$prefix#" \
     -e "s#@libdir@#$prefix/lib#" \
@@ -37,11 +38,16 @@ sed -e "s#@prefix@#$prefix#" \
     -e "s#@pkglibdir@#$pkglibdir#" \
     -e "s#@CXXFLAGS@#$CCFLAGS#" \
     -e "s#@LIBS@#-lgnucap#" \
-    -e "s#@CXX@#$CXX#" < gnucap-conf.in > gnucap-conf
+    -e "s#@CXX@#$CXX#" < $1.in > $1
+}
+
+fill_template config.h
+fill_template gnucap-conf
+
 chmod +x gnucap-conf
 #----------------------------------------------------------------
 echo "CCFLAGS = \\" >Make.ccflags
-echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
+echo "-DUNIX -O2 -DNDEBUG -I. -I.. -I../include -I../../include -W" >>Make.ccflags
 
 echo "LIBS = \\" >Make.libs
 echo "-lgnucap \\" >>Make.libs
@@ -58,7 +64,7 @@ TARGET_EXT =
 LDFLAGS = -rdynamic \
 -L../../lib/O
 
-CONF_CPPFLAGS=-DGNUCAP_PLUGPATH="\"\$(PREFIX)/lib/gnucap\""
+CONF_CPPFLAGS=-DHAVE_CONFIG_H
 
 .SUFFIXES : .o .cc
 .cc.o:; \$(CCC) \$(CXXFLAGS) \$(CONF_CPPFLAGS) \$(CPPFLAGS) \$(CCFLAGS) -c \$<

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