[Pkg-electronics-commits] [gnucap] 05/11: add --cxx and --cxxflags to gnucap-conf

[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 ae88ce769159a19e29ed1f597d04b5f1617d09d5
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sat Jun 20 11:02:53 2015 +0200

    add --cxx and --cxxflags to gnucap-conf
---
 configure      |  5 ++++-
 gnucap-conf.in | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 8460a39..bc38708 100755
--- a/configure
+++ b/configure
@@ -28,12 +28,15 @@ args="--prefix=$prefix"
 # BUG: install plugins to libdir.
 pkglibdir=$prefix/lib
 
+# bug. this is not implemented consistently.
+CXX=${CXX-g++}
+
 sed -e "s#@prefix@#$prefix#" \
     -e "s#@libdir@#$prefix/lib#" \
     -e "s#@pkglibdir@#$pkglibdir#" \
     -e "s#@CXXFLAGS@#$CCFLAGS#" \
     -e "s#@LIBS@#-lgnucap#" \
-    -e "s#@CXX@#$CCC#" < gnucap-conf.in > gnucap-conf
+    -e "s#@CXX@#$CXX#" < gnucap-conf.in > gnucap-conf
 
 echo "Configuring gnucap using $args"
 #---------------------------------------------------
diff --git a/gnucap-conf.in b/gnucap-conf.in
index 473ef83..f70d802 100644
--- a/gnucap-conf.in
+++ b/gnucap-conf.in
@@ -6,12 +6,20 @@ includedir=@includedir@
 libdir=@libdir@
 pkglibdir=@pkglibdir@
 LIBS=@LIBS@
+CXX=@CXX@
+CXXFLAGS=@CXXFLAGS@
 datarootdir=@datarootdir@
 
 case $1 in
 	--cppflags)
 		echo "-I$includedir/gnucap"
 	;;
+	--cxxflags)
+		echo "$CXXFLAGS"
+	;;
+	--cxx)
+		echo "$CXX"
+	;;
 	--ldflags)
 		echo "-L$libdir"
 	;;
@@ -35,6 +43,8 @@ case $1 in
 	;;
 	*)
 	echo $0 --cppflags
+	echo $0 --cxxflags
+	echo $0 --cxx
 	echo $0 --ldflags
 	echo $0 --pkglibdir
 	echo $0 --libdir

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