[Pkg-electronics-commits] [gnucap] 20/43: clang: "c++" not "g++" in configure, fix test_readline order

[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 1988f1c0fafb8f973228b9331aecee7df5daac51
Author: al davis <ad211 at freeelectron.net>
Date:   Sun Apr 16 01:11:23 2017 -0400

    clang: "c++" not "g++" in configure, fix test_readline order
---
 apps/configure       | 2 +-
 include/configure    | 2 +-
 include/patchlev.h   | 2 +-
 lib/configure        | 4 ++--
 lib/test_readline.cc | 1 +
 main/configure       | 4 ++--
 modelgen/configure   | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/configure b/apps/configure
index fce17a9..1fbb987 100755
--- a/apps/configure
+++ b/apps/configure
@@ -35,7 +35,7 @@ echo "" >>Make.libs
 cat <<CAT_EOF >Make.sys
 #------------------------------------------------------------------------
 VPATH = .:..
-CCC = g++
+CCC = c++
 TARGET_EXT = .so
 
 LDFLAGS = -shared
diff --git a/include/configure b/include/configure
index 31dea5e..912b8ab 100755
--- a/include/configure
+++ b/include/configure
@@ -22,7 +22,7 @@ fi
 #----------------------------------------------------------------
 echo \# created by $PWD/$0. do not edit >Make2
 echo \#------------------------------------------------------------------------ >>Make2
-echo "CCC = g++" >>Make2
+echo "CCC = c++" >>Make2
 echo "PREFIX = " $prefix >>Make2
 echo "" >>Make2
 
diff --git a/include/patchlev.h b/include/patchlev.h
index d8bff9c..5e8f9c3 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "plugpath-4 2017.04.15"
+#define PATCHLEVEL "clang-bsd 2017.04.16"
diff --git a/lib/configure b/lib/configure
index b027a5f..bca4767 100755
--- a/lib/configure
+++ b/lib/configure
@@ -28,7 +28,7 @@ echo "CCFLAGS = -fPIC \\" >Make.ccflags
 echo "LIBS = -ldl \\" >Make.libs
     
 rm -f a.out
-g++ -lreadline -ltermcap test_readline.cc
+c++ test_readline.cc -lreadline -ltermcap
 if [ -f a.out ] ; then
     echo "using readline"
     echo "-DHAVE_LIBREADLINE \\" >>Make.ccflags
@@ -46,7 +46,7 @@ echo "" >>Make.libs
 cat <<CAT_EOF >Make.sys
 #------------------------------------------------------------------------
 VPATH = .:..
-CCC = g++
+CCC = c++
 TARGET_EXT = .so
 
 LDFLAGS = -shared
diff --git a/lib/test_readline.cc b/lib/test_readline.cc
index 1138370..7a44d31 100644
--- a/lib/test_readline.cc
+++ b/lib/test_readline.cc
@@ -1,4 +1,5 @@
 //testing=trivial 2006.07.17
+#include <stdio.h> //BUG// sometimes required by readline.h and history.h
 #include <readline/readline.h>
 #include <readline/history.h>
 int main()
diff --git a/main/configure b/main/configure
index 66668bd..fb3db61 100755
--- a/main/configure
+++ b/main/configure
@@ -26,7 +26,7 @@ sed -e "s#/usr/local#$prefix#" ../Makefile.template > Makefile
 pkglibdir=$prefix/lib/gnucap
 
 # bug. this is not implemented consistently.
-CXX=${CXX-g++}
+CXX=${CXX-c++}
 
 fill_template() {
 sed -e "s#@prefix@#$prefix#" \
@@ -57,7 +57,7 @@ echo "" >>Make.libs
 cat <<CAT_EOF >Make.sys
 #------------------------------------------------------------------------
 VPATH = .:..
-CCC = g++
+CCC = c++
 TARGET_EXT =
 
 LDFLAGS = -rdynamic \
diff --git a/modelgen/configure b/modelgen/configure
index b56e2cc..d11d07e 100755
--- a/modelgen/configure
+++ b/modelgen/configure
@@ -36,7 +36,7 @@ echo "" >>Make.libs
 cat <<CAT_EOF >Make.sys
 #------------------------------------------------------------------------
 VPATH = .:..
-CCC = g++
+CCC = c++
 TARGET_EXT =
 
 LDFLAGS = -rdynamic \

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