From 4830aa3afced36f92b1e837bb9d1f50d5635d57a Mon Sep 17 00:00:00 2001
From: stainless <>
Date: Tue, 4 Sep 2001 00:48:14 +0000
Subject: [PATCH] Fixed C++ compiler detection in the 'configure' script.

---
 zsnes/src/Makefile.in  | 2 +-
 zsnes/src/configure    | 3 ++-
 zsnes/src/configure.in | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/zsnes/src/Makefile.in b/zsnes/src/Makefile.in
index edebfc15..72141879 100644
--- a/zsnes/src/Makefile.in
+++ b/zsnes/src/Makefile.in
@@ -65,7 +65,7 @@ OBJS=${CHIPSOBJ} ${CPUOBJ} ${WINOBJ} ${WINDOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${ZIPOBJ}
 	@CC@ @CFLAGS@ -o $@ -c $<
 
 %.o: %.cpp
-    @CXX@ @CFLAGS@ -o $@ -c $<
+    @CXX@ @CXXFLAGS@ -o $@ -c $<
 
 %.o: %.asm
 	@NASMPATH@ @NFLAGS@ -o $@ $<
diff --git a/zsnes/src/configure b/zsnes/src/configure
index c3ec024f..6426d4b9 100755
--- a/zsnes/src/configure
+++ b/zsnes/src/configure
@@ -537,7 +537,7 @@ fi
 
 echo -- Where is our compiler, and who are we compiling for?
 CFLAGS="-pipe -I. -Wall"
-CXXFLAGS=CFLAGS
+CXXFLAGS=$CFLAGS
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -2323,6 +2323,7 @@ done
 
 
 
+CXXFLAGS=$CFLAGS
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
diff --git a/zsnes/src/configure.in b/zsnes/src/configure.in
index af407aba..04f1c4f9 100644
--- a/zsnes/src/configure.in
+++ b/zsnes/src/configure.in
@@ -16,6 +16,7 @@ dnl See also: remarks supplied in the debug checking area below
 AC_INIT(init.asm)
 echo -- Where is our compiler, and who are we compiling for?
 CFLAGS="-pipe -I. -Wall"
+CXXFLAGS=$CFLAGS
 AC_PROG_CC
 AC_PROG_CXX
 AC_PATH_PROG(NASMPATH,nasm,[AC_MSG_ERROR(nasm 0.98 is required)])
@@ -179,6 +180,7 @@ dnl Checks for library functions.
 AC_SUBST(ZSNESEXE)
 AC_SUBST(GL_DRAW)
 AC_SUBST(NFLAGS)
+CXXFLAGS=$CFLAGS
 AC_OUTPUT(Makefile)
 echo 
 echo You may now run make to compile $ZSNESEXE