diff --git a/configure b/configure
index b72c96e4..11c3ebb3 100755
--- a/configure
+++ b/configure
@@ -179,14 +179,14 @@ if $VALID ; then
 	else
 		ARCFLAG=""
 	fi
-	
+
 	if [ -n "$2" ];
 	then
 		CROSSCOMPILE="$2"
 	else
 		CROSSCOMPILE=""
 	fi
-	
+
 	if [ -n "$3" ];
 	then
 		CROSSCOMPILEFLAGS="$3 "
@@ -203,7 +203,7 @@ if $VALID ; then
 	else
 		gcclib="-lstdc++"
 	fi
-	
+
 	if [ -n "$REGTEST" ];
 	then
 		if [ "$REGTEST" = "n" ] || [ "$REGTEST" = "N" ];
@@ -227,29 +227,35 @@ if $VALID ; then
 		libop="-O3"
 		exestrip="-s"
 	fi
-	
+
 	# Use under certain circumstances when GCC is causing problems with FPU
 	#nff="-fno-strict-aliasing -ffloat-store "
 	nff=" "
-	
+
 	(
-	echo "# Portable Makefile generated by configure"
-	echo 
+	echo
+	echo "CC       = ${CROSSCOMPILE}gcc"
+	echo "CXX      = ${CROSSCOMPILE}g++"
+#	echo "CC       = ${CROSSCOMPILE}clang"
+#	echo "CXX      = ${CROSSCOMPILE}clang++"
+	echo "AR       = ${CROSSCOMPILE}ar"
+	echo "RANLIB   = ${CROSSCOMPILE}ranlib"
+	echo "CFLAGS   = ${ARCFLAG}$options ${CROSSCOMPILEFLAGS}"
+	echo "CXXFLAGS = ${ARCFLAG}$options ${CROSSCOMPILEFLAGS}-I."
+#	echo "CXXFLAGS = -Wno-inline-new-delete ${ARCFLAG}$options ${CROSSCOMPILEFLAGS}-I."
+	echo "LFLAGS   = $gcclib -lamathapp${outext} -lcamath${outext} -lcomplex${outext} -lamath${outext}"
+	echo
+	echo "FLXCAT   = build/flexcat"
+	echo "MKDIR    = mkdir"
+	echo "COPY     = cp"
+	echo "DEL      = rm -f"
+	echo "DELREC   = rm -Rf"
+	echo
 	echo "all:	libs app"
-	echo 
-	echo "CC     = ${CROSSCOMPILE}gcc"
-	echo "AR     = ${CROSSCOMPILE}ar"
-	echo "RANLIB = ${CROSSCOMPILE}ranlib"
-	echo "CFLAGS = ${ARCFLAG}$options ${CROSSCOMPILEFLAGS}-I. -Wall -Werror"
-	echo "LFLAGS = $gcclib -lamathapp${outext} -lcamath${outext} -lcomplex${outext} -lamath${outext}"
-	echo 
-	echo "FLXCAT = build/flexcat"
-	echo "MKDIR  = mkdir"
-	echo "COPY   = cp"
-	echo "DEL    = rm -f"
-	echo "DELREC = rm -Rf"
-	echo 
-	
+	echo
+	echo "libs:	libamath libcomplex libcamath libamathapp"
+	echo
+
 	i=""
 	l=""
 	for f in ${APPSRCS}
@@ -261,7 +267,7 @@ if $VALID ; then
 #			p
 #		}' $f | sort -u`
 		echo "${b}.o:	${f}" ${i}
-		echo "	\${CC} ${appop} \${CFLAGS} -Ilib -Iapp -Wall -Werror -c ${f}"
+		echo "	\${CXX} ${appop} \${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c ${f}"
 		echo
 		l="${l} ${b}.o"
 	done
@@ -271,37 +277,37 @@ if $VALID ; then
 	do
 		b=`basename $f .cpp`
 		echo "${b}.o:	${f}"
-		echo "	\${CC} ${appop} \${CFLAGS} -Ilib -Iapp -Wall -Werror -c ${f}"
+		echo "	\${CC} ${appop} \${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c ${f}"
 		echo
 		libapp="${libapp} ${b}.o"
 	done
-	
+
 	libamath=""
 	for f in ${LIBREALSRCS}
 	do
 		b=`basename $f .c`
 		echo "${b}.o:	${f}"
-		echo "	\${CC} ${libop} -std=c9x ${ARCFLAG}-fno-builtin ${nff}-Wall -Werror -Ilib -Ilib/real -c ${f}"
+		echo "	\${CC} ${libop} -std=c9x \${CLAGS} ${ARCFLAG}-fno-builtin ${nff}-Wall -Werror -Ilib -Ilib/real -c ${f}"
 		echo
 		libamath="${libamath} ${b}.o"
 	done
-	
+
 	libcomplex=""
 	for f in ${LIBCPLEXSRCS}
 	do
 		b=`basename $f .c`
 		echo "${b}.o:	${f}"
-		echo "	\${CC} ${libop} -std=c9x ${ARCFLAG}-fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c ${f}"
+		echo "	\${CC} ${libop} -std=c9x \${CFLAGS} ${ARCFLAG}-fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c ${f}"
 		echo
 		libcomplex="${libcomplex} ${b}.o"
 	done
-	
+
 	libc=""
 	for f in ${LIBC1SRCS}
 	do
 		b=`basename $f .c`
 		echo "${b}.o:	${f}"
-		echo "	\${CC} ${libop} -std=c9x ${ARCFLAG}${ansicon}-fno-builtin -Wall -Werror -Ilib -c ${f}"
+		echo "	\${CC} ${libop} -std=c9x \${CFLAGS} ${ARCFLAG}${ansicon}-fno-builtin -Wall -Werror -Ilib -c ${f}"
 		echo
 		libc="${libc} ${b}.o"
 	done
@@ -310,31 +316,29 @@ if $VALID ; then
 	do
 		b=`basename $f .cpp`
 		echo "${b}.o:	${f}"
-		echo "	\${CC} ${libop} ${ARCFLAG}-fno-builtin -Wall -Werror -Ilib -Ilib/dconv -c ${f}"
+		echo "	\${CXX} ${libop} \${CXXFLAGS} ${ARCFLAG}-fno-builtin -Wall -Werror -Ilib -Ilib/dconv -c ${f}"
 		echo
 		libc="${libc} ${b}.o"
 	done
-	
-	echo "libs:	libamath libcomplex libcamath libamathapp"
-	echo
-	echo "catalogsa:	" # Application catalogs
+
+	echo "catalogsa:" # Application catalogs
 	echo "	\${FLXCAT} text/keyword.cd app/localize/kword.h=text/keyword.sd"
 	echo "	\${FLXCAT} text/help.cd app/localize/help.h=text/help.sd"
 	echo "	\${FLXCAT} text/ident.cd app/localize/ident.h=text/ident.sd"
 	echo "	\${FLXCAT} text/text.cd app/localize/text.h=text/text.sd"
 	echo
-	echo "catalogsu:	" # Unix catalogs
+	echo "catalogsu:" # Unix catalogs
 	echo "	iconv -f ISO-8859-15 -t UTF-8 catalog/dansk/amath-help.ct >utext/dk-help.dict"
 	echo "	iconv -f ISO-8859-15 -t UTF-8 catalog/dansk/amath-ident.ct >utext/dk-ident.dict"
 	echo "	iconv -f ISO-8859-15 -t UTF-8 catalog/dansk/amath-text.ct >utext/dk-text.dict"
 	echo "	iconv -f ISO-8859-15 -t UTF-8 catalog/dansk/amath-keyword.ct >utext/dk-keyword.dict"
 	echo
-	echo "catalogsw:	" # Windows catalogs
+	echo "catalogsw:" # Windows catalogs
 	echo "	iconv -f ISO-8859-15 -t CP850 catalog/dansk/amath-help.ct >utext/dk-help.dict"
 	echo "	iconv -f ISO-8859-15 -t CP850 catalog/dansk/amath-ident.ct >utext/dk-ident.dict"
 	echo "	iconv -f ISO-8859-15 -t CP850 catalog/dansk/amath-text.ct >utext/dk-text.dict"
 	echo "	iconv -f ISO-8859-15 -t CP850 catalog/dansk/amath-keyword.ct >utext/dk-keyword.dict"
-	echo 	
+	echo
 	echo "libamathapp:	${libapp}"
 	echo "	\${AR} rcs libamathapp${outext}.a ${libapp}"
 	echo "	\${RANLIB} libamathapp${outext}.a"
@@ -360,7 +364,7 @@ if $VALID ; then
 	echo "	\${COPY} LICENSE dist/"
 	echo "	\${COPY} COPYRIGHT dist/"
 	echo
-	echo "amigacatalogs: "
+	echo "amigacatalogs:"
 #	echo "	\${MKDIR}  dist"
 	echo "	\${MKDIR}  dist/catalog"
 	echo "	\${MKDIR}  dist/catalog/english"
@@ -385,4 +389,8 @@ if $VALID ; then
 	) > Makefile
 
 	echo "Makefile generated${msg}"
+#	echo
+#	echo "Build with debug symbols in csh:"
+#	echo "DEBUG=\"Y\" make"
+	echo
 fi