From fb687c1a524a00a9f50fb244b8aee5ae35d7f7b8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Apr 2005 21:45:43 +0000
Subject: * configure.in, lib/mkmf.rb, {bcc32,win32,wince}/Makefile.sub:
 improve   C++ support.  [ruby-dev:26089]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index be313d598..2abe9454e 100644
--- a/configure.in
+++ b/configure.in
@@ -147,6 +147,7 @@ if test x"${build}" != x"${host}"; then
   AC_CHECK_TOOL(CC, gcc)
 fi
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_GCC_TRADITIONAL
 
 RUBY_PROG_GNU_LD
@@ -800,6 +801,7 @@ AC_SUBST(ARCH_FLAG)dnl
 AC_SUBST(STATIC)dnl
 AC_SUBST(CCDLFLAGS)dnl
 AC_SUBST(LDSHARED)dnl
+AC_SUBST(LDSHAREDXX)dnl
 AC_SUBST(DLEXT)dnl
 AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
@@ -951,6 +953,22 @@ if test "$with_dln_a_out" != yes; then
     RPATHFLAG=" -Wl,-R'%1\$-s'"
   fi
 fi
+if test "${LDSHAREDXX}" = ""; then
+    case "${LDSHARED}" in
+	*'$(CC)'*)
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\$(CC)/$(CXX)/'`
+	    ;;
+	*'${CC}'*)
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\${CC}/${CXX}/'`
+	    ;;
+	*$CC*)
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed "s|$CC|$CXX|"`
+	    ;;
+	ld" "*)
+	    ;;
+    esac
+fi
+
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
 AC_SUBST(RPATHFLAG)
-- 
cgit